diff --git a/frontends/src/quick_frontend/quick_app.py b/frontends/src/quick_frontend/quick_app.py index 3775c405..bc56a27f 100644 --- a/frontends/src/quick_frontend/quick_app.py +++ b/frontends/src/quick_frontend/quick_app.py @@ -619,7 +619,7 @@ class QuickApp(object): # 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 @@ class QuickApp(object): 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 --git a/src/core/sat_main.py b/src/core/sat_main.py index fd315b1d..d8ac3e87 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -640,7 +640,7 @@ class SAT(service.Service): 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: