[commit-gajim] r7276 - trunk/src/common/zeroconf - Commits

17 Oct 2006

Author: sb
Date: 2006-10-17 21:13:36 +0200 (Tue, 17 Oct 2006)
New Revision: 7276
Modified:
   trunk/src/common/zeroconf/connection_handlers_zeroconf.py
Log:
patch from dkirov: fix problem with chat window jid != roster contact jid (local contacts)
Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py
===================================================================

--- trunk/src/common/zeroconf/connection_handlers_zeroconf.py	2006-10-17 16:35:56 UTC (rev 7275)
+++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py	2006-10-17 19:13:36 UTC (rev 7276)
@@ -716,7 +716,7 @@
    		for key in self.connection.zeroconf.contacts:
    			if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]:
    				frm = key
-		frm = str(frm)
+		frm = unicode(frm)
    	jid  = frm
    	no_log_for = gajim.config.get_per('accounts', self.name,
    		'no_log_for').split()
@@ -733,9 +733,6 @@
    	delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None
    	msg_id = 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')
    	# chatstates - look for chatstate tags in a message if not delayed
    	if not delayed:

    