diff --git a/src/gui_interface.py b/src/gui_interface.py index 2dd18fa8f..69aee1612 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -202,7 +202,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 @@ -665,7 +665,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 7ea1ed3c7..1918ed141 100644 --- a/src/notify.py +++ b/src/notify.py @@ -341,7 +341,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( @@ -391,7 +391,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: