Mercurial > libervia-backend
diff sat_bridge/DBus.py @ 18:6928e3cb73a8
refactoring: using xml params part II
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 06 Nov 2009 23:31:00 +0100 |
parents | 74a39f40eb6d |
children | bb72c29f3432 |
line wrap: on
line diff
--- a/sat_bridge/DBus.py Fri Nov 06 19:48:57 2009 +0100 +++ b/sat_bridge/DBus.py Fri Nov 06 23:31:00 2009 +0100 @@ -60,8 +60,8 @@ @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='sss') - def paramUpdate(self, name, value, namespace): - debug("param update signal: %s=%s in namespace %s", name, value, namespace) + def paramUpdate(self, name, value, category): + debug("param update signal: %s=%s in category %s", name, value, category) @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='s') @@ -126,15 +126,10 @@ def setParam(self, name, value, category): self.cb["setParam"](name, str(value), category) - """@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, - in_signature='ss', out_signature='(ss)') - def getParam(self, name, namespace="default"): - return self.cb["getParam"](name, namespace)""" - - """@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, - in_signature='s', out_signature='a(sss)') - def getParams(self, namespace): - return self.cb["getParams"](namespace)""" + @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) @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='s') @@ -142,6 +137,11 @@ return self.cb["getParams"]() @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, + in_signature='s', out_signature='s') + def getParamsForCategory(self, category): + return self.cb["getParamsForCategory"](category) + + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='as') def getParamsCategories(self): return self.cb["getParamsCategories"]() @@ -236,9 +236,9 @@ debug("updating presence for %s",jid) self.dbus_bridge.presenceUpdate(jid, type, show, status, priority) - def paramUpdate(self, name, value, namespace): - debug("updating param [%s] %s ", namespace, name) - self.dbus_bridge.paramUpdate(name, value, namespace) + def paramUpdate(self, name, value, category): + debug("updating param [%s] %s ", category, name) + self.dbus_bridge.paramUpdate(name, value, category) def contactDeleted(self, jid): debug("sending contact deleted signal %s ", jid)