# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1424535759 -3600
# Node ID 49f967fc87aa263fe9a60f8985048f5962108780
# Parent  948dc273ad93c78439e135fdf9d04dba24d1e41d
core, quick_frontends: fixes one typo and a variable naming issue

diff -r 948dc273ad93 -r 49f967fc87aa frontends/src/quick_frontend/quick_app.py
--- a/frontends/src/quick_frontend/quick_app.py	Sat Feb 21 12:34:48 2015 +0100
+++ b/frontends/src/quick_frontend/quick_app.py	Sat Feb 21 17:22:39 2015 +0100
@@ -619,7 +619,7 @@
             # this is a subscriptionn request, we have to ask for user confirmation
             self.showDialog(_("The contact %s wants to subscribe to your presence.\nDo you accept ?") % entity.bare, _('Subscription confirmation'), 'yes/no', answer_cb=self._subscribe_cb, answer_data=(entity, profile))
 
-    def showDialog(self, message, title, type="info", answer_cb=None):
+    def showDialog(self, message, title, type="info", answer_cb=None, answer_data=None):
         raise NotImplementedError
 
     def showAlert(self, message):
@@ -637,8 +637,8 @@
         elif (namespace, name) == ('General', C.SHOW_EMPTY_GROUPS):
             self.contact_lists[profile].showEmptyGroups(C.bool(value))
 
-    def contactDeletedHandler(self, jid, profile):
-        target = jid.JID(jid)
+    def contactDeletedHandler(self, jid_s, profile):
+        target = jid.JID(jid_s)
         self.contact_lists[profile].remove(target)
 
     def entityDataUpdatedHandler(self, entity_s, key, value, profile):
diff -r 948dc273ad93 -r 49f967fc87aa src/core/sat_main.py
--- a/src/core/sat_main.py	Sat Feb 21 12:34:48 2015 +0100
+++ b/src/core/sat_main.py	Sat Feb 21 17:22:39 2015 +0100
@@ -640,7 +640,7 @@
         assert profile
         d1 = self.profiles[profile].roster.removeItem(to_jid)
         d2 = self.profiles[profile].presence.unsubscribe(to_jid)
-        d_list = defer.DefferedList([d1, d2])
+        d_list = defer.DeferredList([d1, d2])
         def check_result(list_result):
             for success, value in list_result:
                 if not success: