diff frontends/src/bridge/DBus.py @ 538:2c4016921403

core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles - added profile argument to askConfirmation, actionResult, actionResultExt, entityDataUpdated, confirmationAnswer, getProgress - core, frontends: fixed calls/signals according to new bridge API - user of proper profile namespace for progression indicators and dialogs - memory: getParam* now return bool when param type is bool - memory: added getStringParam* to return string instead of typed value - core, memory, storage, quick_frontend: getHistory now manage properly multi-profiles - plugins XEP-0047, XEP-0054, XEP-0065, XEP-0077, XEP-0096; multi-profiles proper handling
author Goffi <goffi@goffi.org>
date Sat, 10 Nov 2012 16:38:16 +0100
parents 790be337cc41
children 3eeb6c865e4d
line wrap: on
line diff
--- a/frontends/src/bridge/DBus.py	Sun Nov 04 23:53:26 2012 +0100
+++ b/frontends/src/bridge/DBus.py	Sat Nov 10 16:38:16 2012 +0100
@@ -75,8 +75,8 @@
     def callMenu(self, category, name, menu_type, profile_key):
         return unicode(self.db_core_iface.callMenu(category, name, menu_type, profile_key))
 
-    def confirmationAnswer(self, id, accepted, data):
-        return self.db_core_iface.confirmationAnswer(id, accepted, data)
+    def confirmationAnswer(self, id, accepted, data, profile):
+        return self.db_core_iface.confirmationAnswer(id, accepted, data, profile)
 
     def connect(self, profile_key="@DEFAULT@"):
         return self.db_core_iface.connect(profile_key)
@@ -105,8 +105,8 @@
     def getEntityData(self, jid, keys, profile):
         return self.db_core_iface.getEntityData(jid, keys, profile)
 
-    def getHistory(self, from_jid, to_jid, limit, between=True, callback=None, errback=None):
-        return self.db_core_iface.getHistory(from_jid, to_jid, limit, between, reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:]))
+    def getHistory(self, from_jid, to_jid, limit, between=True, profile="@NONE@", callback=None, errback=None):
+        return self.db_core_iface.getHistory(from_jid, to_jid, limit, between, profile, reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:]))
 
     def getLastResource(self, contact_jid, profile_key="@DEFAULT@"):
         return unicode(self.db_core_iface.getLastResource(contact_jid, profile_key))
@@ -141,8 +141,8 @@
     def getProfilesList(self, ):
         return self.db_core_iface.getProfilesList()
 
-    def getProgress(self, id):
-        return self.db_core_iface.getProgress(id)
+    def getProgress(self, id, profile):
+        return self.db_core_iface.getProgress(id, profile)
 
     def getVersion(self, ):
         return unicode(self.db_core_iface.getVersion())