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

Fix MUC invite notification 

Fixes #9309
This commit is contained in:
Philipp Hörist 2018-08-24 22:03:33 +02:00
parent bf64d04046
commit e665ee1fbe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gajim/gui_interface.py
View File

@ -661,8 +661,8 @@ class Interface:
text = _('You are invited to {room} by {user}').format( text = _('You are invited to {room} by {user}').format(
room=obj.room_jid, user=str(obj.from_)) room=obj.room_jid, user=str(obj.from_))
app.notification.popup( app.notification.popup(
event_type, obj.room_jid, obj.account, 'gc-invitation', event_type, str(obj.from_), obj.account, 'gc-invitation',
'gajim-gc_invitation', event_type, text) 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid)
def forget_gpg_passphrase(self, keyid): def forget_gpg_passphrase(self, keyid):
if keyid in self.gpg_passphrase: if keyid in self.gpg_passphrase:

4
gajim/notify.py
View File

@ -153,7 +153,7 @@ class Notification:
return gtkgui_helpers.get_iconset_name_for(obj.show) return gtkgui_helpers.get_iconset_name_for(obj.show)
def popup(self, event_type, jid, account, type_='', icon_name=None, def popup(self, event_type, jid, account, type_='', icon_name=None,
title=None, text=None, timeout=-1): title=None, text=None, timeout=-1, room_jid=None):
""" """
Notify a user of an event using GNotification and GApplication under Notify a user of an event using GNotification and GApplication under
Linux, Use PopupNotificationWindow under Windows Linux, Use PopupNotificationWindow under Windows
@ -206,7 +206,7 @@ class Notification:
_('Contact Changed Status')): _('Contact Changed Status')):
notif_id = self._id('contact-status-changed', account, jid) notif_id = self._id('contact-status-changed', account, jid)
elif event_type == _('Groupchat Invitation'): elif event_type == _('Groupchat Invitation'):
notif_id = self._id('gc-invitation', account, jid) notif_id = self._id('gc-invitation', account, room_jid)
elif event_type == _('Connection Failed'): elif event_type == _('Connection Failed'):
notif_id = self._id('connection-failed', account) notif_id = self._id('connection-failed', account)
elif event_type in (_('New Message'), _('New Single Message'), elif event_type in (_('New Message'), _('New Single Message'),