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

missing commit

Browse source
This commit is contained in:
Yann Leboulanger 2012-08-24 10:13:55 +02:00
parent 95875d63c6
commit aecfc39a7c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/connection_handlers.py
View file

@ -1043,6 +1043,10 @@ class ConnectionHandlersBase:
gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None,
conn=self, msg_obj=obj)) conn=self, msg_obj=obj))
return True 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 # process and dispatch an error message
def dispatch_error_message(self, msg, msgtxt, session, frm, tim): def dispatch_error_message(self, msg, msgtxt, session, frm, tim):

1
src/gui_interface.py
View file

@ -625,7 +625,6 @@ class Interface:
def handle_event_gc_invitation(self, obj): def handle_event_gc_invitation(self, obj):
#('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))
jid = gajim.get_jid_without_resource(obj.jid_from)
account = obj.conn.name account = obj.conn.name
if helpers.allow_popup_window(account) or not self.systray_enabled: if helpers.allow_popup_window(account) or not self.systray_enabled:
dialogs.InvitationReceivedDialog(account, obj.room_jid, dialogs.InvitationReceivedDialog(account, obj.room_jid,