diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2011-12-03 16:33:03 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2011-12-03 16:33:03 +0400 |
| commit | 0d4e2c350e48d8685678ef3ac69a61df7970d681 (patch) | |
| tree | ff633efa23d3c1db72807ba12e0d4e70aa904f05 | |
| parent | 2e79e8172e93a336fec9f2b5b4de86b767fa68ce (diff) | |
prevent traceback. Fixes #7053
| -rw-r--r-- | src/common/connection_handlers_events.py | 1 | ||||
| -rw-r--r-- | src/session.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py index 96516e833..1d149ad5d 100644 --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1214,6 +1214,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = self.msg_obj.forwarded self.sent = self.msg_obj.sent self.popup = False + self.msg_id = None # id in log database self.receipt_request_tag = self.stanza.getTag('request', namespace=xmpp.NS_RECEIPTS) diff --git a/src/session.py b/src/session.py index c35f65007..32389d870 100644 --- a/src/session.py +++ b/src/session.py @@ -74,8 +74,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if self.control and self.control.resource: self.control.change_resource(self.resource) - obj.msg_id = None - if obj.mtype == 'chat': if not obj.stanza.getTag('body') and obj.chatstate is None: return |