Skip to content
Snippets Groups Projects
Commit 5f9e24a7 authored by sb's avatar sb
Browse files

fix TB on receiving message after merge from trunk

parent bbeab47d
No related branches found
No related tags found
No related merge requests found
...@@ -705,6 +705,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream): ...@@ -705,6 +705,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
def _messageCB(self, ip, con, msg): def _messageCB(self, ip, con, msg):
'''Called when we receive a message''' '''Called when we receive a message'''
msgtxt = msg.getBody() msgtxt = msg.getBody()
msghtml = msg.getXHTML()
mtype = msg.getType() mtype = msg.getType()
subject = msg.getSubject() # if not there, it's None subject = msg.getSubject() # if not there, it's None
tim = msg.getTimestamp() tim = msg.getTimestamp()
...@@ -786,7 +787,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream): ...@@ -786,7 +787,7 @@ class ConnectionHandlersZeroconf(ConnectionVcard, ConnectionBytestream):
msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim, msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim,
subject = subject) subject = subject)
self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, 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 elif mtype == 'normal': # it's single message
if self.name not in no_log_for and jid not in no_log_for and msgtxt: 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, gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment