From 0bbcc937fd7726430687c569a421b34ebc0d8a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Fri, 24 Aug 2018 22:03:33 +0200 Subject: [PATCH] Fix MUC invite notification Fixes #9309 --- gajim/gui_interface.py | 4 ++-- gajim/notify.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py index 5080583ba..e7f9fd43f 100644 --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -661,8 +661,8 @@ class Interface: text = _('You are invited to {room} by {user}').format( room=obj.room_jid, user=str(obj.from_)) app.notification.popup( - event_type, obj.room_jid, obj.account, 'gc-invitation', - 'gajim-gc_invitation', event_type, text) + event_type, str(obj.from_), obj.account, 'gc-invitation', + 'gajim-gc_invitation', event_type, text, room_jid=obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: diff --git a/gajim/notify.py b/gajim/notify.py index 8313952bc..74e382f22 100644 --- a/gajim/notify.py +++ b/gajim/notify.py @@ -153,7 +153,7 @@ class Notification: return gtkgui_helpers.get_iconset_name_for(obj.show) 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 Linux, Use PopupNotificationWindow under Windows @@ -206,7 +206,7 @@ class Notification: _('Contact Changed Status')): notif_id = self._id('contact-status-changed', account, jid) 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'): notif_id = self._id('connection-failed', account) elif event_type in (_('New Message'), _('New Single Message'),