summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-09-28 21:17:50 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-09-29 00:07:37 +0200
commit5a618cf2c2f0a2d7cbc06dd240199799610ba544 (patch)
tree6a1ac8563d7c552cd818e599feed0aa250de8a8c /src
parentb6953d3fcfcb0f1aa931cc58291febf776bdae0b (diff)
downloadpoezio-5a618cf2c2f0a2d7cbc06dd240199799610ba544.tar.gz
poezio-5a618cf2c2f0a2d7cbc06dd240199799610ba544.tar.bz2
poezio-5a618cf2c2f0a2d7cbc06dd240199799610ba544.tar.xz
poezio-5a618cf2c2f0a2d7cbc06dd240199799610ba544.zip
Don’t use deprecated-then-removed aliases from slixmpp.
Diffstat (limited to 'src')
-rw-r--r--src/multiuserchat.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index c0bc21b5..92d09a60 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -97,7 +97,7 @@ def change_nick(core, jid, nick, status=None, show=None):
def join_groupchat(core, jid, nick, passwd='', maxhistory=None, status=None, show=None, seconds=None):
xmpp = core.xmpp
- stanza = xmpp.makePresence(pto='%s/%s' % (jid, nick), pstatus=status, pshow=show)
+ stanza = xmpp.make_presence(pto='%s/%s' % (jid, nick), pstatus=status, pshow=show)
x = ET.Element('{http://jabber.org/protocol/muc}x')
if passwd:
passelement = ET.Element('password')
@@ -131,7 +131,7 @@ def set_user_role(xmpp, jid, nick, reason, role, callback=None):
(role = 'none': eject user)
"""
jid = safeJID(jid)
- iq = xmpp.makeIqSet()
+ iq = xmpp.make_iq_set()
query = ET.Element('{%s}query' % NS_MUC_ADMIN)
item = ET.Element('{%s}item' % NS_MUC_ADMIN, {'nick':nick, 'role':role})
if reason:
@@ -165,7 +165,7 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason
item.append(reason_item)
query.append(item)
- iq = xmpp.makeIqSet(query)
+ iq = xmpp.make_iq_set(query)
iq['to'] = muc_jid
if callback:
return iq.send(callback=callback)
@@ -180,14 +180,14 @@ def cancel_config(xmpp, room):
query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
x = ET.Element('{jabber:x:data}x', type='cancel')
query.append(x)
- iq = xmpp.makeIqSet(query)
+ iq = xmpp.make_iq_set(query)
iq['to'] = room
iq.send()
def configure_room(xmpp, room, form):
if form is None:
return
- iq = xmpp.makeIqSet()
+ iq = xmpp.make_iq_set()
iq['to'] = room
query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
form = form.getXML('submit')