changeset 08fdd45011d4 in /home/hg/repos/gajim-plugins

author: lovetox forenjunkie@chello.at branches: details:gajim-plugins?cmd=changeset;node=08fdd45011d4 description: Catch import error

diffstat:

omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 8457659b652f -r 08fdd45011d4 omemo/__init__.py --- a/omemo/__init__.py Sun Oct 23 19:14:30 2016 +0200 +++ b/omemo/__init__.py Wed Oct 26 22:36:06 2016 +0200 @@ -31,8 +31,6 @@ from nbxmpp.simplexml import Node from nbxmpp import NS_CORRECT, NS_ADDRESS

-from . import ui -from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, BundleInformationQuery, DeviceListAnnouncement, DevicelistQuery, @@ -75,6 +73,7 @@ if not ERROR_MSG: try: from .omemo.state import OmemoState + from .ui import Ui, OMEMOConfigDialog except Exception as e: log.error(e) ERROR_MSG = 'Error: ' + str(e) @@ -118,6 +117,7 @@ if ERROR_MSG: self.activatable = False self.available_text = ERROR_MSG + self.config_dialog = None return self.events_handlers = { 'mam-message-received': (ged.PRECORE, self.mam_message_received), @@ -139,7 +139,7 @@ self.events_handlers['muc-admin-received'] =\ (ged.PRECORE, self.room_memberlist_received)

- self.config_dialog = ui.OMEMOConfigDialog(self) + self.config_dialog = OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, self.disconnect_ui), 'groupchat_control': (self.connect_ui,