From 33f3c535a1bbde2d614a8c7cf24eeeea36c11c65 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 3 Jan 2015 15:24:58 +0100
Subject: [PATCH] don't show useless buttons in notifications. Fixes #7838
---
src/gui_interface.py | 4 ++--
src/notify.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gui_interface.py b/src/gui_interface.py
index 5a92b1c2d1..e193bb241a 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -201,7 +201,7 @@ class Interface:
path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
account = obj.conn.name
notify.popup(_('Connection Failed'), account, account,
- 'connection_failed', path, obj.title, obj.msg)
+ '', path, obj.title, obj.msg)
def unblock_signed_in_notifications(self, account):
gajim.block_signed_in_notifications[account] = False
@@ -664,7 +664,7 @@ class Interface:
else:
path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
account = obj.conn.name
- notify.popup('warning', account, account, 'warning', path,
+ notify.popup('warning', account, account, '', path,
_('OpenPGP Passphrase Incorrect'),
_('You are currently connected without your OpenPGP key.'))
self.forget_gpg_passphrase(obj.keyID)
diff --git a/src/notify.py b/src/notify.py
index 1fd2dca82e..0f90d1f096 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -332,7 +332,7 @@ class DesktopNotification:
version = self.version
if version[:2] == [0, 2]:
actions = {}
- if 'actions' in self.capabilities:
+ if 'actions' in self.capabilities and self.msg_type:
actions = {'default': 0}
try:
self.notif.Notify(
@@ -381,7 +381,7 @@ class DesktopNotification:
self.path_to_image = os.path.abspath(
gtkgui_helpers.get_icon_path('gajim', 48))
actions = ()
- if 'actions' in self.capabilities:
+ if 'actions' in self.capabilities and self.msg_type:
actions = (dbus.String('default'), dbus.String(
self.event_type))
try:
--
GitLab