From d2894a35853b8ffd87ad483c8b0afadfc2a7233e Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Sat, 2 Feb 2013 22:45:27 +0400 Subject: [PATCH] Backed out changeset: bd65c90efaf0 --- gotr/manifest.ini | 2 +- gotr/otrmodule.py | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gotr/manifest.ini b/gotr/manifest.ini index a1653ef..07081fa 100644 --- a/gotr/manifest.ini +++ b/gotr/manifest.ini @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.7.3 +version: 1.7.2 description: Provide OTR encryption authors: Kjell Braden homepage: http://gajim-otr.pentabarf.de diff --git a/gotr/otrmodule.py b/gotr/otrmodule.py index 6c43980..ea6144d 100644 --- a/gotr/otrmodule.py +++ b/gotr/otrmodule.py @@ -85,12 +85,6 @@ try: except ImportError: HAS_CRYPTO = False -nb_xmpp = False -import common.xmpp -if not dir(common.xmpp): - import nbxmpp - nb_xmpp = True - HAS_POTR = True try: import potr @@ -125,10 +119,7 @@ try: msg = unicode(msg) account = self.user.accountname - if not nb_xmpp: - stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat') - else: - stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat') + stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat') if appdata is not None: session = appdata.get('session', None) if session is not None: