From ce0d57d183ca863ba749e1b77a3e7a39cedb3162 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Wed, 26 Dec 2012 16:17:31 +0400 Subject: [PATCH] JuickPlugin. add nbxmpp support(used for avatars) --- juick/manifest.ini | 2 +- juick/plugin.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/juick/manifest.ini b/juick/manifest.ini index 8bbeee7..e0dd423 100644 --- a/juick/manifest.ini +++ b/juick/manifest.ini @@ -1,7 +1,7 @@ [info] name: Juick short_name: Juick -version: 0.9.2 +version: 0.9.3 description: Clickable Juick links , Juick nicks, preview Juick picturs. The key combination alt + up in the textbox allow insert the number of last message (comment or topic). authors: Denis Fomin diff --git a/juick/plugin.py b/juick/plugin.py index 94cdb2d..f179749 100644 --- a/juick/plugin.py +++ b/juick/plugin.py @@ -17,7 +17,12 @@ from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog from conversation_textview import TextViewImage import gtkgui_helpers + +nb_xmpp = False import common.xmpp +if not dir(common.xmpp): + import nbxmpp + nb_xmpp = True class JuickPlugin(GajimPlugin): @@ -372,7 +377,10 @@ class Base(object): # nick not in the db id_ = conn.connection.getAnID() to = 'juick@juick.com' - iq = common.xmpp.Iq('get', to=to) + if not nb_xmpp: + iq = common.xmpp.Iq('get', to=to) + else: + iq = nbxmpp.Iq('get', to=to) a = iq.addChild(name='query', namespace='http://juick.com/query#users') a.addChild(name='user', namespace='http://juick.com/user',