changeset 30885eb6658e in /home/hg/repos/gajim-plugins
author: lovetox <[email protected]>
branches:
details:gajim-plugins?cmd=changeset;node=30885eb6658e
description: Missing exception variable & removed str conv.
diffstat:
omemo/omemo/state.py | 6 +++---
omemo/ui.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (35 lines):
diff -r 9d4eec8dda39 -r 30885eb6658e omemo/omemo/state.py
--- a/omemo/omemo/state.py Sun Jun 26 22:02:33 2016 +0200
+++ b/omemo/omemo/state.py Mon Jun 27 00:55:33 2016 +0200
@@ -188,8 +188,8 @@
key = self.handleWhisperMessage(sender_jid, sid, encrypted_key)
except (NoSessionException, InvalidMessageException) as e:
log.error('No Session found ' + e.message)
- log.error('sender_jid => ' + str(sender_jid) + ' sid =>' +
str(
- sid))
+ log.error('sender_jid => ' + str(sender_jid) + ' sid =>' +
+ str(sid))
return
except (DuplicateMessageException) as e:
log.error('Duplicate message found ' + str(e.args))
@@ -197,7 +197,7 @@
' sid => ' + str(sid))
return
- except (DuplicateMessageException):
+ except (DuplicateMessageException) as e:
log.error('Duplicate message found ' + e.message)
log.error('sender_jid => ' + str(sender_jid) +
' sid => ' + str(sid))
diff -r 9d4eec8dda39 -r 30885eb6658e omemo/ui.py
--- a/omemo/ui.py Sun Jun 26 22:02:33 2016 +0200
+++ b/omemo/ui.py Mon Jun 27 00:55:33 2016 +0200
@@ -126,7 +126,7 @@
_add_widget(self.omemobutton, self.chat_control)
def encryption_active(self):
- return self.state.encryption.is_active(str(self.contact))
+ return self.state.encryption.is_active(self.contact.jid)
def activate_omemo(self):
self.omemobutton.menu.set_active(0)
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
