comparison src/bridge/DBus.py @ 1224:f0c9b149ed99

bridge, memory: add "search" attribute to getHistory (filter the results with a unix globbing pattern)
author souliane <souliane@mailoo.org>
date Sat, 04 Oct 2014 10:25:32 +0200
parents f094583732de
children f8a8434dbac7
comparison
equal deleted inserted replaced
1223:802b7e6bf098 1224:f0c9b149ed99
275 async_callbacks=None) 275 async_callbacks=None)
276 def getEntityData(self, jid, keys, profile): 276 def getEntityData(self, jid, keys, profile):
277 return self._callback("getEntityData", unicode(jid), keys, unicode(profile)) 277 return self._callback("getEntityData", unicode(jid), keys, unicode(profile))
278 278
279 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, 279 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
280 in_signature='ssibs', out_signature='a(dssssa{ss})', 280 in_signature='ssibss', out_signature='a(dssssa{ss})',
281 async_callbacks=('callback', 'errback')) 281 async_callbacks=('callback', 'errback'))
282 def getHistory(self, from_jid, to_jid, limit, between=True, profile="@NONE@", callback=None, errback=None): 282 def getHistory(self, from_jid, to_jid, limit, between=True, search='', profile="@NONE@", callback=None, errback=None):
283 return self._callback("getHistory", unicode(from_jid), unicode(to_jid), limit, between, unicode(profile), callback=callback, errback=errback) 283 return self._callback("getHistory", unicode(from_jid), unicode(to_jid), limit, between, unicode(search), unicode(profile), callback=callback, errback=errback)
284 284
285 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, 285 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
286 in_signature='ss', out_signature='s', 286 in_signature='ss', out_signature='s',
287 async_callbacks=None) 287 async_callbacks=None)
288 def getLastResource(self, contact_jid, profile_key="@DEFAULT@"): 288 def getLastResource(self, contact_jid, profile_key="@DEFAULT@"):