core, quick_frontends: fixes one typo and a variable naming issue

This commit is contained in:
souliane 2015-02-21 17:22:39 +01:00
commit b5d70cbe34
2 changed files with 4 additions and 4 deletions

View file

@ -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):

View file

@ -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: