Commit d2894a35 authored by Dicson's avatar Dicson

Backed out changeset: bd65c90efaf0

parent 00aa4538
[info]
name: Off-The-Record Encryption
short_name: gotr
version: 1.7.3
version: 1.7.2
description: Provide OTR encryption
authors: Kjell Braden <afflux.gajim@pentabarf.de>
homepage: http://gajim-otr.pentabarf.de
......
......@@ -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:
......
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