diff --git a/frontends/src/wix/main_window.py b/frontends/src/wix/main_window.py index 909ffe62..a9bf9426 100644 --- a/frontends/src/wix/main_window.py +++ b/frontends/src/wix/main_window.py @@ -484,14 +484,14 @@ class MainWindow(wx.Frame, QuickApp): dlg.ShowModal() dlg.Destroy() return - _id = self.bridge.getCard(target.bare, profile_key=self.profile) + _id = self.bridge.getCard(target.bare, self.profile) self.current_action_ids.add(_id) self.current_action_ids_cb[_id] = self.onProfileReceived def onProfileReceived(self, data): """Called when a profile is received""" debug (_('Profile received: [%s]') % data) - profile=Profile(self, data) + Profile(self, data) def onJoinRoom(self, e): warning('FIXME: temporary menu, must be improved') diff --git a/src/plugins/plugin_xep_0054.py b/src/plugins/plugin_xep_0054.py index 8921b709..6824cb68 100755 --- a/src/plugins/plugin_xep_0054.py +++ b/src/plugins/plugin_xep_0054.py @@ -21,8 +21,7 @@ from sat.core.i18n import _ from sat.core.constants import Const as C from logging import debug, info, error -from twisted.internet import threads -from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.internet import threads, defer from twisted.words.protocols.jabber import jid from twisted.words.protocols.jabber.xmlstream import IQ from twisted.words.xish import domish @@ -156,7 +155,7 @@ class XEP_0054(object): debug(_("file [%s] already in cache") % image_hash) return image_hash - @inlineCallbacks + @defer.inlineCallbacks def vCard2Dict(self, vcard, target, profile): """Convert a VCard to a dict, and save binaries""" debug(_("parsing vcard")) @@ -183,7 +182,7 @@ class XEP_0054(object): else: info(_('FIXME: [%s] VCard tag is not managed yet') % elem.name) - returnValue(dictionary) + defer.returnValue(dictionary) def vcard_ok(self, answer, profile): """Called after the first get IQ"""