Commit f532fcbb authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'master' into 'master'

Version 1.9.8

Closes #187

See merge request !19
parents 37bad708 0ef31bd0
[info]
name: Off-The-Record Encryption
short_name: gotr
version: 1.9.7
version: 1.9.8
description: Provide OTR encryption. Read the <a href="https://dev.gajim.org/gajim/gajim-plugins/wikis/offtherecordplugin">Wiki</a> before use.
authors: Kjell Braden <afflux.gajim@pentabarf.de>
homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/offtherecordplugin
......
......@@ -76,10 +76,9 @@ from message_control import TYPE_CHAT, MessageControl
from plugins.helpers import log_calls, log
from plugins.plugin import GajimPluginException
sys.path.insert(0, os.path.dirname(__file__))
import ui
sys.path.insert(0, os.path.dirname(ui.__file__))
from HTMLParser import HTMLParser
from htmlentitydefs import name2codepoint
name2codepoint['apos'] = 0x0027
......@@ -247,8 +246,9 @@ try:
except IOError, e:
log.exception('IOError occurred when loading fpr file for %s',
self.name)
except ImportError:
except ImportError as e:
HAS_POTR = False
print(e)
def otr_dialog_destroy(widget, *args, **kwargs):
widget.destroy()
......
......@@ -23,12 +23,11 @@ import gtk
from common import gajim
from plugins.gui import GajimPluginConfigDialog
import otrmodule
try:
import potr
import potr.proto
except ImportError:
pass
except ImportError as e:
print(e)
class OtrPluginConfigDialog(GajimPluginConfigDialog):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment