summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--python/dbus.py52
-rw-r--r--python/examples/Makefile.am2
-rw-r--r--python/examples/gconf-proxy-client.py11
-rw-r--r--python/examples/gconf-proxy-service.py48
5 files changed, 127 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d9207ac6..de691981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
2004-05-29 Seth Nickell <seth@gnome.org>
* python/dbus.py:
+
+ Add ObjectTree class which allows implementation
+ of trees of "virtual" objects. Basically the python
+ wrapper for "register_fallback".
+
+ * python/examples/Makefile.am
+ * python/examples/gconf-proxy-client.py:
+ * python/examples/gconf-proxy-service.py:
+
+ Implement a simple GConf proxy service that supports
+ get/set on string and int GConf keys using the ObjectTree.
+
+2004-05-29 Seth Nickell <seth@gnome.org>
+
+ * python/dbus.py:
* python/examples/example-client.py:
* python/examples/example-service.py:
* python/examples/list-system-services.py:
diff --git a/python/dbus.py b/python/dbus.py
index 583c5548..2c405c73 100644
--- a/python/dbus.py
+++ b/python/dbus.py
@@ -240,7 +240,7 @@ class Object:
def _unregister_cb(self, connection):
print ("Unregister")
-
+
def _message_cb(self, connection, message):
target_method_name = message.get_member()
target_method = self._method_name_to_method[target_method_name]
@@ -272,6 +272,56 @@ class Object:
method_dict[method.__name__] = method
return method_dict
+class ObjectTree:
+ """An object tree allows you to register a handler for a tree of object paths.
+ This means that literal Python objects do not need to be created for each object
+ over the bus, but you can have a virtual tree of objects handled by a single
+ Python object.
+ """
+
+ def __init__(self, base_path, service):
+ self._base_path = base_path
+ self._service = service
+ self._bus = service.get_bus()
+ self._connection = self._bus.get_connection()
+
+ self._connection.register_fallback(base_path, self._unregister_cb, self._message_cb)
+
+ def object_method_called(self, object_path, method_name, argument_list):
+ """Override this method. Called with, object_path, the relative path of the object
+ under the base_path, the name of the method invoked, and a list of arguments
+ """
+ raise NotImplementedException, "object_method_called() must be overriden"
+
+ def _unregister_cb(self, connection):
+ print ("Unregister")
+
+ def _message_cb(self, connection, message):
+ target_object_full_path = message.get_path()
+ assert(self._base_path == target_object_full_path[:len(self._base_path)])
+ target_object_path = target_object_full_path[len(self._base_path):]
+
+ target_method_name = message.get_member()
+ args = message.get_args_list()
+
+ try:
+ retval = self.object_method_called(target_object_path, target_method_name, args)
+ except Exception, e:
+ if e.__module__ == '__main__':
+ # FIXME: is it right to use .__name__ here?
+ error_name = e.__class__.__name__
+ else:
+ error_name = e.__module__ + '.' + str(e.__class__.__name__)
+ error_contents = str(e)
+ reply = dbus_bindings.Error(message, error_name, error_contents)
+ else:
+ reply = dbus_bindings.MethodReturn(message)
+ if retval != None:
+ iter = reply.get_iter()
+ iter.append(retval)
+
+ self._connection.send(reply)
+
class RemoteService:
"""A remote service providing objects.
diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
index 743c520e..8eab412e 100644
--- a/python/examples/Makefile.am
+++ b/python/examples/Makefile.am
@@ -4,6 +4,8 @@ EXTRA_DIST = \
example-service.py \
example-client.py \
example-signal.py \
+ gconf-proxy-client.py \
+ gconf-proxy-service.py \
list-system-services.py \
$(NULL)
diff --git a/python/examples/gconf-proxy-client.py b/python/examples/gconf-proxy-client.py
new file mode 100644
index 00000000..f9c63097
--- /dev/null
+++ b/python/examples/gconf-proxy-client.py
@@ -0,0 +1,11 @@
+import dbus
+
+gconf_key = "/desktop/gnome/file_views/icon_theme"
+
+bus = dbus.SessionBus()
+gconf_service = bus.get_service("org.gnome.GConf")
+gconf_key_object = gconf_service.get_object("/org/gnome/GConf" + gconf_key, "org.gnome.GConf")
+
+value = gconf_key_object.getString()
+
+print ("Value of GConf key %s is %s" % (gconf_key, value))
diff --git a/python/examples/gconf-proxy-service.py b/python/examples/gconf-proxy-service.py
new file mode 100644
index 00000000..b5842e80
--- /dev/null
+++ b/python/examples/gconf-proxy-service.py
@@ -0,0 +1,48 @@
+import dbus
+
+import gtk
+import gconf
+
+class GConfService(dbus.Service):
+
+ def __init__(self):
+ dbus.Service.__init__(self, "org.gnome.GConf", dbus.SessionBus())
+
+ gconf_object_tree = self.GConfObjectTree(self)
+
+ class GConfObjectTree(dbus.ObjectTree):
+
+ def __init__(self, service):
+ dbus.ObjectTree.__init__(self, "/org/gnome/GConf", service)
+
+ self.client = gconf.client_get_default()
+
+ def object_method_called(self, object_path, method_name, argument_list):
+ print ("Method %s called on GConf key %s" % (method_name, object_path))
+
+ return_value = None
+
+ if "getString" == method_name:
+ assert(len(argument_list) == 0)
+ return_value = self.client.get_string (object_path)
+
+ elif "setString" == method_name:
+ assert(len(argument_list) == 1)
+ self.client.set_string(object_path, argument_list[0])
+
+ elif "getInt" == method_name:
+ assert(len(argument_list) == 0)
+ return_value = self.client.get_int(object_path)
+
+ elif "setInt" == method_name:
+ assert(len(argument_list) == 1)
+ self.client.set_int(object_path, argument_list[0])
+
+ return return_value
+
+gconf_service = GConfService()
+
+print ("GConf Proxy service started.")
+print ("Run 'gconf-proxy-client.py' to fetch a GConf key through the proxy...")
+
+gtk.main()