Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Bethge <stefan@lanpartei.de>2006-10-09 18:27:20 +0400
committerStefan Bethge <stefan@lanpartei.de>2006-10-09 18:27:20 +0400
commit5f9e24a776b12ef4ae7bbb5775a8d1856105c20a (patch)
tree373e090a1d982a1bfdcbcfb3609dd1d63aac6492 /src
parentbbeab47dc779fe9cf6807ccfc647a89cdc0023db (diff)
fix TB on receiving message after merge from trunk
Diffstat (limited to 'src')
-rw-r--r--src/common/zeroconf/connection_handlers_zeroconf.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/src/common/zeroconf/connection_handlers_zeroconf.py
index cc71cfe74..e9ba59f18 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,