From 70c3c04feea0de900da90a0ec9fb10e28f17d08f Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 9 Dec 2012 23:24:53 +0100 Subject: [PATCH] plugin XEP-0077: misc fixes --- src/plugins/plugin_xep_0077.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/plugin_xep_0077.py b/src/plugins/plugin_xep_0077.py index 5c75784c..16ed9891 100755 --- a/src/plugins/plugin_xep_0077.py +++ b/src/plugins/plugin_xep_0077.py @@ -20,12 +20,9 @@ along with this program. If not, see . """ from logging import debug, info, error -from twisted.words.protocols.jabber import client, jid -from twisted.words.protocols.jabber import error as jab_error +from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import IQ -from twisted.internet import reactor from sat.tools.xml_tools import dataForm2xml -import pdb from wokkel import data_form @@ -115,8 +112,8 @@ class XEP_0077(): answer_data['reason'] = 'unknown' answer_data={"message":_("Registration failed")} self.host.bridge.actionResult(answer_type, failure.value.stanza['id'], answer_data, profile) - if self.triggers.has_key(answer["from"]): - del self.triggers[answer["from"]] + if failure.value.stanza["from"] in self.triggers.has_key: + del self.triggers[failure.value.stanza["from"]] def in_band_submit(self, action, target, fields, profile): """Submit a form for registration, using data_form""" @@ -138,6 +135,6 @@ class XEP_0077(): reg_request=IQ(client.xmlstream,'get') reg_request["from"]=client.jid.full() reg_request["to"] = to_jid.full() - query=reg_request.addElement('query', NS_REG) - reg_request.send(to_jid.full()).addCallbacks(self.reg_ok, self.reg_err, callbackArgs=[profile], errbackArgs=[profile]) + reg_request.addElement('query', NS_REG) + reg_request.send(to_jid.full()).addCallbacks(self.reg_ok, self.reg_err, callbackArgs=[client.profile], errbackArgs=[client.profile]) return reg_request["id"]