changeset 62d0306604fd in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=62d0306604fd description: don't show useless buttons in notifications. Fixes #7838

diffstat:

src/gui_interface.py | 4 ++-- src/notify.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 458e2751848c -r 62d0306604fd src/gui_interface.py --- a/src/gui_interface.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/gui_interface.py Sat Jan 03 15:24:58 2015 +0100 @@ -202,7 +202,7 @@ 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 @@ 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 -r 458e2751848c -r 62d0306604fd src/notify.py --- a/src/notify.py Sat Jan 03 14:15:18 2015 +0100 +++ b/src/notify.py Sat Jan 03 15:24:58 2015 +0100 @@ -341,7 +341,7 @@ 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 @@ 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: