Mercurial > libervia-backend
changeset 1325:49f967fc87aa frontends_multi_profiles
core, quick_frontends: fixes one typo and a variable naming issue
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Sat, 21 Feb 2015 17:22:39 +0100 |
| parents | 948dc273ad93 |
| children | 88e40f31b17e |
| files | frontends/src/quick_frontend/quick_app.py src/core/sat_main.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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: