diff src/bridge/DBus.py @ 541:8b116fa42a31

core, bridge: waiting confirmation management (new getWaitingConf method)
author Goffi <goffi@goffi.org>
date Wed, 14 Nov 2012 20:24:28 +0100
parents 2c4016921403
children ca13633d3b6b
line wrap: on
line diff
--- a/src/bridge/DBus.py	Mon Nov 12 10:55:44 2012 +0100
+++ b/src/bridge/DBus.py	Wed Nov 14 20:24:28 2012 +0100
@@ -116,7 +116,7 @@
 
     @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
                          signature='ssa{ss}s')
-    def askConfirmation(self, conf_type, id, data, profile):
+    def askConfirmation(self, id, conf_type, data, profile):
         pass
 
     @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
@@ -352,6 +352,12 @@
         return self._callback("getVersion", )
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
+                         in_signature='s', out_signature='a(ssa{ss})',
+                         async_callbacks=None)
+    def getWaitingConf(self, profile_key):
+        return self._callback("getWaitingConf", unicode(profile_key))
+
+    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='s', out_signature='a{ss}',
                          async_callbacks=None)
     def getWaitingSub(self, profile_key="@DEFAULT@"):
@@ -509,8 +515,8 @@
     def actionResultExt(self, answer_type, id, data, profile):
         self.dbus_bridge.actionResultExt(answer_type, id, data, profile)
 
-    def askConfirmation(self, conf_type, id, data, profile):
-        self.dbus_bridge.askConfirmation(conf_type, id, data, profile)
+    def askConfirmation(self, id, conf_type, data, profile):
+        self.dbus_bridge.askConfirmation(id, conf_type, data, profile)
 
     def connected(self, profile):
         self.dbus_bridge.connected(profile)