core(memory.disco), bridge: discoInfos and discoItems now handle node
This commit is contained in:
parent
749bd76f62
commit
0a2a18ebaf
1 changed files with 26 additions and 18 deletions
|
|
@ -234,16 +234,16 @@ class DbusObject(dbus.service.Object):
|
|||
return self._callback("delContact", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback)
|
||||
|
||||
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
in_signature='ss', out_signature='(asa(sss)a{sa(a{ss}as)})',
|
||||
in_signature='sss', out_signature='(asa(sss)a{sa(a{ss}as)})',
|
||||
async_callbacks=('callback', 'errback'))
|
||||
def discoInfos(self, entity_jid, profile_key, callback=None, errback=None):
|
||||
return self._callback("discoInfos", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback)
|
||||
def discoInfos(self, entity_jid, node=u'', profile_key=u"@DEFAULT@", callback=None, errback=None):
|
||||
return self._callback("discoInfos", unicode(entity_jid), unicode(node), unicode(profile_key), callback=callback, errback=errback)
|
||||
|
||||
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
in_signature='ss', out_signature='a(sss)',
|
||||
in_signature='sss', out_signature='a(sss)',
|
||||
async_callbacks=('callback', 'errback'))
|
||||
def discoItems(self, entity_jid, profile_key, callback=None, errback=None):
|
||||
return self._callback("discoItems", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback)
|
||||
def discoItems(self, entity_jid, node=u'', profile_key=u"@DEFAULT@", callback=None, errback=None):
|
||||
return self._callback("discoItems", unicode(entity_jid), unicode(node), unicode(profile_key), callback=callback, errback=errback)
|
||||
|
||||
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
in_signature='s', out_signature='',
|
||||
|
|
|
|||
Loading…
Reference in a new issue