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

patch from dkirov: fix problem with chat window jid != roster contact jid (local contacts)

Browse source
This commit is contained in:
Stefan Bethge 2006-10-17 19:13:36 +00:00
parent ff735c4d36
commit e5806104ce
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/zeroconf/connection_handlers_zeroconf.py
View file

@ -716,7 +716,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
for key in self.connection.zeroconf.contacts: for key in self.connection.zeroconf.contacts:
if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]: if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]:
frm = key frm = key
frm = str(frm) frm = unicode(frm)
jid = frm jid = frm
no_log_for = gajim.config.get_per('accounts', self.name, no_log_for = gajim.config.get_per('accounts', self.name,
'no_log_for').split() 'no_log_for').split()
@ -733,9 +733,6 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None
msg_id = None msg_id = None
composing_jep = None composing_jep = None
# FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) do NOT RECOMMENDED
# invitation
# stanza (MUC JEP) remove in 2007, as we do not do NOT RECOMMENDED
xtags = msg.getTags('x') xtags = msg.getTags('x')
# chatstates - look for chatstate tags in a message if not delayed # chatstates - look for chatstate tags in a message if not delayed
if not delayed: if not delayed: