From 5f9e24a776b12ef4ae7bbb5775a8d1856105c20a Mon Sep 17 00:00:00 2001
From: Stefan Bethge <stefan@lanpartei.de>
Date: Mon, 9 Oct 2006 14:27:20 +0000
Subject: [PATCH] fix TB on receiving message after merge from trunk
---
src/common/zeroconf/connection_handlers_zeroconf.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index cc71cfe746..e9ba59f180 100644
--- a/src/common/zeroconf/connection_handlers_zeroconf.py
+++ b/src/common/zeroconf/connection_handlers_zeroconf.py
@@ -705,6 +705,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
def _messageCB(self, ip, con, msg):
'''Called when we receive a message'''
msgtxt = msg.getBody()
+ msghtml = msg.getXHTML()
mtype = msg.getType()
subject = msg.getSubject() # if not there, it's None
tim = msg.getTimestamp()
@@ -786,7 +787,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim,
subject = subject)
self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject,
- chatstate, msg_id, composing_jep, user_nick))
+ chatstate, msg_id, composing_jep, user_nick, msghtml))
elif mtype == 'normal': # it's single message
if self.name not in no_log_for and jid not in no_log_for and msgtxt:
gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
--
GitLab