Commit 39c8319e authored by louiz’'s avatar louiz’

Fix a bunch of iq.send() by removing the `block` argument

parent ecf22cb4
......@@ -815,11 +815,11 @@ def command_quit(self, arg=''):
else:
msg = None
if config.get('enable_user_mood', True):
self.xmpp.plugin['xep_0107'].stop(block=False)
self.xmpp.plugin['xep_0107'].stop()
if config.get('enable_user_activity', True):
self.xmpp.plugin['xep_0108'].stop(block=False)
self.xmpp.plugin['xep_0108'].stop()
if config.get('enable_user_gaming', True):
self.xmpp.plugin['xep_0196'].stop(block=False)
self.xmpp.plugin['xep_0196'].stop()
self.save_config()
self.plugin_manager.disable_plugins()
self.disconnect(msg)
......
......@@ -423,11 +423,11 @@ class Core(object):
log.error("%s received. Exiting…", signals[sig])
if config.get('enable_user_mood', True):
self.xmpp.plugin['xep_0107'].stop(block=False)
self.xmpp.plugin['xep_0107'].stop()
if config.get('enable_user_activity', True):
self.xmpp.plugin['xep_0108'].stop(block=False)
self.xmpp.plugin['xep_0108'].stop()
if config.get('enable_user_gaming', True):
self.xmpp.plugin['xep_0196'].stop(block=False)
self.xmpp.plugin['xep_0196'].stop()
self.plugin_manager.disable_plugins()
self.disconnect('%s received' % signals.get(sig))
self.xmpp.add_event_handler("disconnected", self.exit, disposable=True)
......
......@@ -47,7 +47,7 @@ def destroy_room(xmpp, room, reason='', altroom=''):
_('Info'))
else:
xmpp.core.information(_('Room %s destroyed') % room, _('Info'))
iq.send(block=False, callback=callback)
iq.send(callback=callback)
return True
def send_private_message(xmpp, jid, line):
......@@ -142,7 +142,7 @@ def set_user_role(xmpp, jid, nick, reason, role, callback=None):
iq.append(query)
iq['to'] = jid
if callback:
return iq.send(block=False, callback=callback)
return iq.send(callback=callback)
try:
return iq.send()
except Exception as e:
......@@ -168,7 +168,7 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason
iq = xmpp.makeIqSet(query)
iq['to'] = muc_jid
if callback:
return iq.send(block=False, callback=callback)
return iq.send(callback=callback)
try:
return xmpp.plugin['xep_0045'].setAffiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation)
except:
......@@ -182,7 +182,7 @@ def cancel_config(xmpp, room):
query.append(x)
iq = xmpp.makeIqSet(query)
iq['to'] = room
iq.send(block=False)
iq.send()
def configure_room(xmpp, room, form):
if form is None:
......@@ -193,5 +193,5 @@ def configure_room(xmpp, room, form):
form = form.getXML('submit')
query.append(form)
iq.append(query)
iq.send(block=False)
iq.send()
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