gotr.add nbxmpp support

gotr/manifest.ini

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

gotr/otrmodule.py

@@ -85,6 +85,12 @@ 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
@@ -119,7 +125,10 @@ try:
             msg = unicode(msg)
             account = self.user.accountname
 
-            stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat')
+            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')
             if appdata is not None:
                 session = appdata.get('session', None)
                 if session is not None: