# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1395912980 -3600
# Node ID 01342bfe9f418a86c8081658da86c09a1854b051
# Parent  fc7e0828b18e413e3a41688799c59b5636f1abc3
wix: fixed onShowProfile

diff -r fc7e0828b18e -r 01342bfe9f41 frontends/src/wix/main_window.py
--- a/frontends/src/wix/main_window.py	Thu Mar 27 02:24:20 2014 +0100
+++ b/frontends/src/wix/main_window.py	Thu Mar 27 10:36:20 2014 +0100
@@ -484,14 +484,14 @@
             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 -r fc7e0828b18e -r 01342bfe9f41 src/plugins/plugin_xep_0054.py
--- a/src/plugins/plugin_xep_0054.py	Thu Mar 27 02:24:20 2014 +0100
+++ b/src/plugins/plugin_xep_0054.py	Thu Mar 27 10:36:20 2014 +0100
@@ -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 @@
                     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 @@
             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"""