changeset 797ac319baa9 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=797ac319baa9
description: store full from jid in gc-invite event.
fix receiving decline tag
diffstat:
src/common/connection_handlers_events.py | 3 ++-
src/gui_interface.py | 2 +-
src/roster_window.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diffs (46 lines):
diff -r 59be13833475 -r 797ac319baa9 src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py Fri Aug 24 10:13:55 2012 +0200
+++ b/src/common/connection_handlers_events.py Fri Aug 24 10:27:51 2012 +0200
@@ -1207,7 +1207,7 @@
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 @@
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 -r 59be13833475 -r 797ac319baa9 src/gui_interface.py
--- a/src/gui_interface.py Fri Aug 24 10:13:55 2012 +0200
+++ b/src/gui_interface.py Fri Aug 24 10:27:51 2012 +0200
@@ -633,7 +633,7 @@
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 -r 59be13833475 -r 797ac319baa9 src/roster_window.py
--- a/src/roster_window.py Fri Aug 24 10:13:55 2012 +0200
+++ b/src/roster_window.py Fri Aug 24 10:27:51 2012 +0200
@@ -1985,8 +1985,8 @@
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':
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
