hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset: bd65c90efaf0

Browse Source
This commit is contained in:
Denis Fomin
2013-02-02 22:45:27 +04:00
parent 00aa453885
commit d2894a3585
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gotr/manifest.ini
View File

@@ -1,7 +1,7 @@
[info] [info]
name: Off-The-Record Encryption name: Off-The-Record Encryption
short_name: gotr short_name: gotr
version: 1.7.3 version: 1.7.2
description: Provide OTR encryption description: Provide OTR encryption
authors: Kjell Braden <afflux.gajim@pentabarf.de> authors: Kjell Braden <afflux.gajim@pentabarf.de>
homepage: http://gajim-otr.pentabarf.de homepage: http://gajim-otr.pentabarf.de

9
gotr/otrmodule.py
View File

@@ -85,12 +85,6 @@ try:
except ImportError: except ImportError:
HAS_CRYPTO = False HAS_CRYPTO = False
nb_xmpp = False
import common.xmpp
if not dir(common.xmpp):
import nbxmpp
nb_xmpp = True
HAS_POTR = True HAS_POTR = True
try: try:
import potr import potr
@@ -125,10 +119,7 @@ try:
msg = unicode(msg) msg = unicode(msg)
account = self.user.accountname account = self.user.accountname
if not nb_xmpp:
stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat') stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat')
else:
stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat')
if appdata is not None: if appdata is not None:
session = appdata.get('session', None) session = appdata.get('session', None)
if session is not None: if session is not None: