copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't show useless buttons in notifications. Fixes #7838

This commit is contained in:
Yann Leboulanger 2015-01-03 15:24:58 +01:00
parent 12949450e7
commit 78b3fe0b20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_interface.py
View File

@ -202,7 +202,7 @@ class Interface:
path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
account = obj.conn.name account = obj.conn.name
notify.popup(_('Connection Failed'), account, account, 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): def unblock_signed_in_notifications(self, account):
gajim.block_signed_in_notifications[account] = False gajim.block_signed_in_notifications[account] = False
@ -665,7 +665,7 @@ class Interface:
else: else:
path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48) path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48)
account = obj.conn.name account = obj.conn.name
notify.popup('warning', account, account, 'warning', path, notify.popup('warning', account, account, '', path,
_('OpenPGP Passphrase Incorrect'), _('OpenPGP Passphrase Incorrect'),
_('You are currently connected without your OpenPGP key.')) _('You are currently connected without your OpenPGP key.'))
self.forget_gpg_passphrase(obj.keyID) self.forget_gpg_passphrase(obj.keyID)

4
src/notify.py
View File

@ -341,7 +341,7 @@ class DesktopNotification:
version = self.version version = self.version
if version[:2] == [0, 2]: if version[:2] == [0, 2]:
actions = {} actions = {}
if 'actions' in self.capabilities: if 'actions' in self.capabilities and self.msg_type:
actions = {'default': 0} actions = {'default': 0}
try: try:
self.notif.Notify( self.notif.Notify(
@ -391,7 +391,7 @@ class DesktopNotification:
self.path_to_image = os.path.abspath( self.path_to_image = os.path.abspath(
gtkgui_helpers.get_icon_path('gajim', 48)) gtkgui_helpers.get_icon_path('gajim', 48))
actions = () actions = ()
if 'actions' in self.capabilities: if 'actions' in self.capabilities and self.msg_type:
actions = (dbus.String('default'), dbus.String( actions = (dbus.String('default'), dbus.String(
self.event_type)) self.event_type))
try: try: