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

treat incoming messages from a groupchat jid as a groupchat message

This commit is contained in:
Yann Leboulanger 2010-06-10 09:24:22 +02:00
parent 62710e906a
commit 3f4194e1a8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/connection_handlers.py
View File

@ -1484,7 +1484,7 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
thread_id = msg.getThread()
if not mtype:
if not mtype or mtype not in ('chat', 'groupchat', 'error'):
mtype = 'normal'
msgtxt = msg.getBody()
@ -1493,6 +1493,14 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
xep_200_encrypted = msg.getTag('c', namespace=common.xmpp.NS_STANZA_CRYPTO)
session = None
gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, self.name)
if not gc_control and \
jid in gajim.interface.minimized_controls[self.name]:
gc_control = gajim.interface.minimized_controls[self.name][jid]
if gc_control and jid == frm: # message from a gc without a resource
mtype = 'groupchat'
if mtype != 'groupchat':
session = self.get_or_create_session(frm, thread_id)