diff sat_bridge/DBus.py @ 22:bb72c29f3432

added action cb mechanism for buttons. Tested with a temporary new user registration button.
author Goffi <goffi@goffi.org>
date Tue, 01 Dec 2009 04:56:08 +0100
parents 6928e3cb73a8
children 53e921c8a357
line wrap: on
line diff
--- a/sat_bridge/DBus.py	Sun Nov 08 01:49:08 2009 +0100
+++ b/sat_bridge/DBus.py	Tue Dec 01 04:56:08 2009 +0100
@@ -73,10 +73,10 @@
     def askConfirmation(self, type, id, data):
         debug("asking for confirmation: id = [%s]  type = %s data = %s", id, type, data)
 
-    @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
+    @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
                          signature='ssa{ss}')
-    def sendAnswer(self, type, id, data):
-        debug("sending answer: id = [%s]  type = %s data = %s", id, type, data)
+    def actionResult(self, type, id, data):
+        debug("result of action: id = [%s]  type = %s data = %s", id, type, data)
 
     ### methods ###    
 
@@ -128,8 +128,8 @@
         
     @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
                          in_signature='ss', out_signature='s')
-    def getParamV(self, name, category="default"):
-        return self.cb["getParamV"](name, category)
+    def getParamA(self, name, category="default"):
+        return self.cb["getParamA"](name, category)
 
     @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
                          in_signature='', out_signature='s')
@@ -171,6 +171,11 @@
         return self.cb["isConnected"]()
 
     @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
+                         in_signature='sa{ss}', out_signature='s')
+    def launchAction(self, type, data):
+        return self.cb["launchAction"](type, data)
+    
+    @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
                          in_signature='sba{ss}', out_signature='')
     def confirmationAnswer(self, id, accepted, data):
         debug("Answer for confirmation [%s]: %s", id, "Accepted" if accepted else "Refused")
@@ -247,8 +252,8 @@
     def askConfirmation(self, type, id, data):
         self.dbus_bridge.askConfirmation(type, id, data)
 
-    def sendAnswer(self, type, id, data):
-        self.dbus_bridge.sendAnswer(type, id, data)
+    def actionResult(self, type, id, data):
+        self.dbus_bridge.actionResult(type, id, data)
 
     def register(self, name, callback):
         debug("registering DBus bridge method [%s]",name)