Support all type value of gconf.

diff --git a/gconf/config.py b/gconf/config.py
index b8b2bfe127933efe15b9105e30dc3baf659abdcd..935fc178e43a83f9d27e1178e2167ee596140659 100644 (file)
--- a/gconf/config.py
+++ b/gconf/config.py
@@ -23,13 +23,15 @@ import gconf
 import ibus
 from ibus import interface
 
+GCONF_IBUS_PATH = "/desktop/ibus"
+
 class Config(ibus.Object):
     def __init__ (self, conn, path):
         super(Config, self).__init__()
         self.__proxy = ConfigProxy(self, conn, path)
         self.__client = gconf.Client()
-        self.__client.connect("value-changed", self.__value_changed_cb)
-        self.__client.add_dir("/", gconf.CLIENT_PRELOAD_NONE)
+        self.__handler_id = self.__client.connect("value-changed", self.__value_changed_cb)
+        self.__client.add_dir(GCONF_IBUS_PATH, gconf.CLIENT_PRELOAD_NONE)
 
     def get_string(self, key):
         pass
@@ -37,7 +39,7 @@ class Config(ibus.Object):
         pass
     def get_bool(self, key):
         pass
-    
+
     def set_string(self, key, value):
         pass
     def set_int(self, key, value):
@@ -47,10 +49,59 @@ class Config(ibus.Object):
 
     def do_destroy(self):
         self.__proxy = None
+        self.__client.disconnect(self.__handler_id)
+        self.__client = None
+
+    def __to_py_value(self, value):
+        if value.type == gconf.VALUE_STRING:
+            return value.get_string()
+        if value.type == gconf.VALUE_INT:
+            return value.get_int()
+        if value.type == gconf.VALUE_FLOAT:
+            return value.get_float()
+        if value.type == gconf.VALUE_BOOL:
+            return value.get_bool()
+        if value.type == gconf.VALUE_PAIR:
+            return (self.__to_py_value(value.get_car()), self.__to_py_value(value.get_cdr()))
+        if value.type == gconf.VALUE_LIST:
+            return map(self.__to_py_value, value.get_list())
+
+    def __to_gconf_value(self, value):
+        if isinstance(value, str):
+            ret = gconf.Value(gconf.VALUE_STRING)
+            ret.set_string(value)
+        elif isinstance(value, int):
+            ret = gconf.Value(gconf.VALUE_INT)
+            ret.set_int(value)
+        elif isinstance(value, float):
+            ret = gconf.Value(gconf.VALUE_FLOAT)
+            ret.set_float(value)
+        elif isinstance(value, bool):
+            ret = gconf.Value(gconf.VALUE_BOOL)
+            ret.set_bool(value)
+        elif isinstance(value, tuple):
+            if len(value) != 2:
+                raise ibus.IBusException("Pair must have two value")
+            ret = gconf.Value(gconf.VALUE_PAIR)
+            ret.set_car(self.__to_gconf_value(value[0]))
+            ret.set_crd(self.__to_gconf_value(value[1]))
+        elif isinstance(value, list):
+            ret = gconf.Value(gconf.VALUE_LIST)
+            if len(value) > 0:
+                value = map(self.__to_gconf_value, value)
+                _type = value[0].type
+                if any(map(lambda x: x.type != _type, value)):
+                    raise ibus.IBusException("Items of a list must be in same type")
+                ret.set_list_type(_type)
+                ret.set_list(value)
+        return ret
 
     def __value_changed_cb(self, gconf, key, value):
-        value = self.__client.get_value(key)
+        value = self.__client.get(key)
+        value = self.__to_py_value(value)
+
         print key, type(value), value
+        print key, type(value), self.__to_gconf_value(value)
         self.__proxy.ValueChanged(key, value)
 
 class ConfigProxy(interface.IConfig):
@@ -71,6 +122,7 @@ class ConfigProxy(interface.IConfig):
         self.__config.set_int(key, value)
     def SetBool(self, key, value):
         self.__config.set_bool(key, value)
+
     def Destroy(self):
         self.remove_from_connection()
         self.__config.destroy()