From 44ff71b3a3d79639cb3bc5c592d3d4580bb9ad01 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sat, 3 Jan 2015 17:25:11 +0100 Subject: Fix small issues in the OTR plugin --- plugins/otr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/otr.py b/plugins/otr.py index 3fc8c65e..38817d89 100644 --- a/plugins/otr.py +++ b/plugins/otr.py @@ -595,7 +595,7 @@ class Plugin(BasePlugin): return except ErrorReceived as err: # Received an OTR error - format_dict['err'] = err.args[0] + format_dict['err'] = bytes(err.args[0]).decode('utf-8') tab.add_message(OTR_ERROR % format_dict, typ=0) del msg['body'] del msg['html'] @@ -791,7 +791,7 @@ class Plugin(BasePlugin): del msg['body'] del msg['replace'] del msg['html'] - elif ctx.getPolicy('REQUIRE_ENCRYPTION'): + elif ctx and ctx.getPolicy('REQUIRE_ENCRYPTION'): tab.add_message(MESSAGE_NOT_SENT % format_dict, typ=0) del msg['body'] del msg['replace'] -- cgit v1.2.3