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

prevent showing twice the same message in muc when we are twice in a room from 2 accounts.

This commit is contained in:
Yann Leboulanger 2010-10-19 21:43:44 +02:00
parent 2315d8a14a
commit 186b84c481
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/connection_handlers_events.py
View File

@ -1042,6 +1042,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent):
self.fjid = self.msg_obj.fjid self.fjid = self.msg_obj.fjid
self.msgtxt = self.msg_obj.msgtxt self.msgtxt = self.msg_obj.msgtxt
self.jid = self.msg_obj.jid self.jid = self.msg_obj.jid
self.room_jid = self.msg_obj.jid
self.timestamp = self.msg_obj.timestamp self.timestamp = self.msg_obj.timestamp
self.xhtml_msgtxt = self.stanza.getXHTML() self.xhtml_msgtxt = self.stanza.getXHTML()

4
src/groupchat_control.py
View File

@ -811,7 +811,7 @@ class GroupchatControl(ChatControlBase):
menu.destroy() menu.destroy()
def _nec_gc_message_received(self, obj): def _nec_gc_message_received(self, obj):
if obj.jid != self.room_jid: if obj.room_jid != self.room_jid or obj.conn.name != self.account:
return return
if obj.captcha_form: if obj.captcha_form:
if self.form_widget: if self.form_widget:
@ -1270,7 +1270,7 @@ class GroupchatControl(ChatControlBase):
self.draw_role(role) self.draw_role(role)
def _nec_gc_presence_received(self, obj): def _nec_gc_presence_received(self, obj):
if obj.room_jid != self.room_jid: if obj.room_jid != self.room_jid or obj.conn.name != self.account:
return return
if obj.ptype == 'error': if obj.ptype == 'error':
return return