From 30d033c7c35d48797f0415a0f3ae78ee27b081b2 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 24 Aug 2012 10:27:51 +0200 Subject: [PATCH] store full from jid in gc-invite event. fix receiving decline tag --- src/common/connection_handlers_events.py | 3 ++- src/gui_interface.py | 2 +- src/roster_window.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py index e23389971..27fa590a2 100644 --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1207,7 +1207,7 @@ class GcDeclineReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.room_jid = self.msg_obj.fjid - item = self.msg_obj.invite_tag.getTag('decline') + item = self.msg_obj.decline_tag.getTag('decline') try: self.jid_from = helpers.parse_jid(item.getAttr('from')) except helpers.InvalidFormat: @@ -1234,6 +1234,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.resource = self.msg_obj.resource self.mtype = self.msg_obj.mtype self.invite_tag = self.msg_obj.invite_tag + self.decline_tag = self.msg_obj.decline_tag self.thread_id = self.msg_obj.thread_id self.msgtxt = self.msg_obj.msgtxt self.gc_control = self.msg_obj.gc_control diff --git a/src/gui_interface.py b/src/gui_interface.py index b6c8f7ef4..bfda4ea86 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -633,7 +633,7 @@ class Interface: return self.add_event(account, obj.jid_from, 'gc-invitation', (obj.room_jid, - obj.reason, obj.password, obj.is_continued)) + obj.reason, obj.password, obj.is_continued, obj.jid_from)) if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-gc_invitation', 48) diff --git a/src/roster_window.py b/src/roster_window.py index d24087a26..69fd74f90 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1985,8 +1985,8 @@ class RosterWindow: gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'gc-invitation': - dialogs.InvitationReceivedDialog(account, data[0], jid, data[2], - data[1]) + dialogs.InvitationReceivedDialog(account, data[0], data[4], data[2], + data[1], is_continued=data[3]) gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'subscription_request':