2004-05-30 Seth Nickell <seth@gnome.org>

	* python/dbus.py:

	Add a nicer-but-less-flexible alternate API for handling
	calls to virtual objects in dbus.ObjectTree.

	Screw up the argument order to the dbus.Object constructor
	for consistency with dbus.ObjectTree (and to make dbus_methods
	optional for future extension)

	* python/examples/Makefile.am:
	* python/examples/gconf-proxy-service.py:
	* python/examples/gconf-proxy-service2.py:

	Alternate implementation of gconf-proxy-service using the
	nicer dbus.ObjectTree API.

	* python/examples/example-service.py:
	* python/tests/test-server.py

	Reverse the argument order to deal with dbus.Object constructor
	changes.

1 files changed, 17 insertions, 25 deletions

diff --git a/python/examples/gconf-proxy-service.py b/python/examples/gconf-proxy-service.py
index b5842e80..76e43ce8 100644
--- a/python/examples/gconf-proxy-service.py
+++ b/python/examples/gconf-proxy-service.py
@@ -11,35 +11,27 @@ class GConfService(dbus.Service):
         gconf_object_tree = self.GConfObjectTree(self)
         
     class GConfObjectTree(dbus.ObjectTree):
-
         def __init__(self, service):
-            dbus.ObjectTree.__init__(self, "/org/gnome/GConf", service)
+            dbus.ObjectTree.__init__(self, "/org/gnome/GConf", service, dbus_methods=[ self.getString, self.setString, self.getInt, self.setInt ])
 
             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
 
+        def getString(self, object_path):
+            print ("getString called on GConf key %s" % (object_path))
+            return self.client.get_string(object_path)
+
+        def setString(self, object_path, new_value):
+            print ("setString called on GConf key %s" % (object_path))            
+            self.client.set_string(object_path, new_value)
+
+        def getInt(self, object_path):
+            print ("getInt called on GConf key %s" % (object_path))
+            return self.client.get_int(object_path)
+
+        def setInt(self, object_path, new_value):
+            print ("setInt called on GConf key %s" % (object_path))
+            self.client.set_int(object_path, new_value)
+            
 gconf_service = GConfService()
 
 print ("GConf Proxy service started.")