changeset 59be13833475 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=59be13833475
description: missing commit
diffstat:
src/common/connection_handlers.py | 4 ++++
src/gui_interface.py | 1 -
2 files changed, 4 insertions(+), 1 deletions(-)
diffs (25 lines):
diff -r a80a9012088f -r 59be13833475 src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Fri Aug 24 09:50:50 2012 +0200
+++ b/src/common/connection_handlers.py Fri Aug 24 10:13:55 2012 +0200
@@ -1043,6 +1043,10 @@
gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None,
conn=self, msg_obj=obj))
return True
+ elif obj.decline_tag is not None:
+ gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None,
+ conn=self, msg_obj=obj))
+ return True
# process and dispatch an error message
def dispatch_error_message(self, msg, msgtxt, session, frm, tim):
diff -r a80a9012088f -r 59be13833475 src/gui_interface.py
--- a/src/gui_interface.py Fri Aug 24 09:50:50 2012 +0200
+++ b/src/gui_interface.py Fri Aug 24 10:13:55 2012 +0200
@@ -625,7 +625,6 @@
def handle_event_gc_invitation(self, obj):
#('GC_INVITATION', (room_jid, jid_from, reason, password,
is_continued))
- jid = gajim.get_jid_without_resource(obj.jid_from)
account = obj.conn.name
if helpers.allow_popup_window(account) or not self.systray_enabled:
dialogs.InvitationReceivedDialog(account, obj.room_jid,
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
