summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-06-14 22:01:25 +0200
committermathieui <mathieui@mathieui.net>2014-06-14 22:01:25 +0200
commitc1803944bae4fe799a49013ffd4bf623363a5c6b (patch)
tree700b4b5ef3e36b4f95b615463ea704f77b3e4dbc
parent900b67c01d86a44b75dbcde41ce82ecf46d82001 (diff)
downloadpoezio-c1803944bae4fe799a49013ffd4bf623363a5c6b.tar.gz
poezio-c1803944bae4fe799a49013ffd4bf623363a5c6b.tar.bz2
poezio-c1803944bae4fe799a49013ffd4bf623363a5c6b.tar.xz
poezio-c1803944bae4fe799a49013ffd4bf623363a5c6b.zip
fix a tb in the otr plugin
-rw-r--r--plugins/otr.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/otr.py b/plugins/otr.py
index a4012c47..74b06cf1 100644
--- a/plugins/otr.py
+++ b/plugins/otr.py
@@ -26,7 +26,8 @@ it is not pretty.
Installation
------------
-To use the OTR plugin, you must first install pure-python-otr.
+To use the OTR plugin, you must first install pure-python-otr and pycrypto
+(for python3).
You have to install it from the git because a few issues were
found with the python3 compatibility while writing this plugin,
@@ -232,7 +233,7 @@ class PoezioContext(Context):
if not tab:
tab = self.core.get_tab_by_name(safeJID(self.peer).bare,
DynamicConversationTab)
- if not tab.locked_resource == safeJID(self.peer).resource:
+ if tab and not tab.locked_resource == safeJID(self.peer).resource:
tab = None
if self.state == STATE_ENCRYPTED:
if newstate == STATE_ENCRYPTED: