From cae8faf0ed7e1e447abcd01640b351135b33e885 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 16 Dec 2012 23:53:32 +0100
Subject: [PATCH] fix module name
---
src/adhoc_commands.py | 2 +-
src/common/connection.py | 6 +++---
src/common/connection_handlers.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index 8e08595122..f2edcd3ef9 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -572,7 +572,7 @@ class CommandWindow:
"""
Request the command list. Change stage on delivery
"""
- query = nbxmpp.Iq(typ='get', to=xmpp.JID(self.jid),
+ query = nbxmpp.Iq(typ='get', to=nbxmpp.JID(self.jid),
queryNS=nbxmpp.NS_DISCO_ITEMS)
query.setQuerynode(nbxmpp.NS_COMMANDS)
diff --git a/src/common/connection.py b/src/common/connection.py
index 06e9bded06..d3ec7d6c7a 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -2656,10 +2656,10 @@ class Connection(CommonConnection, ConnectionHandlers):
"""
message = nbxmpp.Message(to=room)
- x = xmpp.DataForm(typ='submit')
- x.addChild(node=xmpp.DataField(name='FORM_TYPE',
+ x = nbxmpp.DataForm(typ='submit')
+ x.addChild(node=nbxmpp.DataField(name='FORM_TYPE',
value=nbxmpp.NS_MUC + '#request'))
- x.addChild(node=xmpp.DataField(name='muc#role', value='participant',
+ x.addChild(node=nbxmpp.DataField(name='muc#role', value='participant',
typ='text-single'))
message.addChild(node=x)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c5b6b73119..ffd112f405 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1722,7 +1722,7 @@ ConnectionJingle, ConnectionIBBytestream):
gajim.jid_is_transport(obj.fjid) or obj.jid in self.jids_for_auto_auth \
or obj.transport_auto_auth:
if self.connection:
- p = xmpp.Presence(obj.fjid, 'subscribed')
+ p = nbxmpp.Presence(obj.fjid, 'subscribed')
p = self.add_sha(p)
self.connection.send(p)
if gajim.jid_is_transport(obj.fjid) or obj.transport_auto_auth:
--
GitLab