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

improve decline implementation

Browse source
This commit is contained in:
Yann Leboulanger 2012-08-24 12:54:27 +02:00
parent 1b870be4e7
commit c42b00702d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/connection_handlers.py
View file

@ -1035,10 +1035,6 @@ class ConnectionHandlersBase:
self.dispatch_error_message(obj.stanza, obj.msgtxt,
obj.session, obj.fjid, obj.timestamp)
return True
elif obj.mtype == 'groupchat':
gajim.nec.push_incoming_event(GcMessageReceivedEvent(None,
conn=self, msg_obj=obj))
return True
elif obj.invite_tag is not None:
gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None,
conn=self, msg_obj=obj))
@ -1047,6 +1043,10 @@ class ConnectionHandlersBase:
gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None,
conn=self, msg_obj=obj))
return True
elif obj.mtype == 'groupchat':
gajim.nec.push_incoming_event(GcMessageReceivedEvent(None,
conn=self, msg_obj=obj))
return True
# process and dispatch an error message
def dispatch_error_message(self, msg, msgtxt, session, frm, tim):

2
src/gui_interface.py
View file

@ -621,7 +621,7 @@ class Interface:
if gc_control:
gc_control.print_conversation(
_('%(jid)s declined the invitation: %(reason)s') % {
'jid': obj.room_jid, 'reason': obj.reason}, graphics=False)
'jid': obj.jid_from, 'reason': obj.reason}, graphics=False)
def handle_event_gc_invitation(self, obj):
#('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))