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

fix TB on receiving message after merge from trunk

This commit is contained in:
Stefan Bethge 2006-10-09 14:27:20 +00:00
parent bbeab47dc7
commit 5f9e24a776
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/zeroconf/connection_handlers_zeroconf.py
View File

@ -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):
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,