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

prevent traceback. Fixes #7053

This commit is contained in:
Yann Leboulanger 2011-12-03 13:33:03 +01:00
parent be867b7843
commit de4660b2e5
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/connection_handlers_events.py
View File

@ -1203,6 +1203,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.forwarded = self.msg_obj.forwarded self.forwarded = self.msg_obj.forwarded
self.sent = self.msg_obj.sent self.sent = self.msg_obj.sent
self.popup = False self.popup = False
self.msg_id = None # id in log database
self.receipt_request_tag = self.stanza.getTag('request', self.receipt_request_tag = self.stanza.getTag('request',
namespace=xmpp.NS_RECEIPTS) namespace=xmpp.NS_RECEIPTS)

2
src/session.py
View File

@ -74,8 +74,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if self.control and self.control.resource: if self.control and self.control.resource:
self.control.change_resource(self.resource) self.control.change_resource(self.resource)
obj.msg_id = None
if obj.mtype == 'chat': if obj.mtype == 'chat':
if not obj.stanza.getTag('body') and obj.chatstate is None: if not obj.stanza.getTag('body') and obj.chatstate is None:
return return