WIP. config.

diff --git a/Makefile.am b/Makefile.am
index 79b877a6af9b6bb4e5e01bdee6a3eb26960ba54c..a7a660087386b3672a955fa41924786060c9aa88 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@
 
 SUBDIRS = \
        daemon \
+       gconf \
        ibus \
        panel \
        engine \

diff --git a/configure.ac b/configure.ac
index c86d37ec07b1a56c14497a51e16c2d2ff5732ecd..bbe269b95f5fc6c40cd45c404673c5015429b176 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,8 @@ daemon/Makefile
 daemon/ibus-daemon
 panel/Makefile
 panel/ibus-panel
+gconf/Makefile
+gconf/ibus-gconf
 engine/Makefile
 gtk2/Makefile
 qt4/Makefile

diff --git a/ibus/interface/__init__.py b/ibus/interface/__init__.py
index 3c80a4f20dde49ba0d48f7194dd233b78b5be72a..618e96b421a711102474dd52b2369904f123bb88 100644 (file)
--- a/ibus/interface/__init__.py
+++ b/ibus/interface/__init__.py
@@ -19,7 +19,8 @@
 # Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA  02111-1307  USA
 
-from iibus import IIBus
-from iengine import IEngine
-from ienginefactory import IEngineFactory
-from ipanel import IPanel
+from iibus import *
+from iengine import *
+from ienginefactory import *
+from ipanel import *
+from iconfig import *

diff --git a/ibus/interface/iconfig.py b/ibus/interface/iconfig.py
index 587aec6e9e0c06bc85e6670d81fb6b7a054d02a6..be4334dcf74bab2b23856f865159dfc0f5528ed8 100644 (file)
--- a/ibus/interface/iconfig.py
+++ b/ibus/interface/iconfig.py
@@ -43,26 +43,30 @@ class IConfig (dbus.service.Object):
                        **args)
 
        @method (in_signature = "ss", out_signature = "s")
-       def ReadString (self, key, default_value):
+       def GetString (self, key, default_value):
                pass
 
        @method (in_signature = "si", out_signature = "i")
-       def ReadInt (self, key, default_value):
+       def GetInt (self, key, default_value):
                pass
 
        @method (in_signature = "sb", out_signature = "b")
-       def ReadBool (self, key, default_value):
+       def GetBool (self, key, default_value):
                pass
 
        @method (in_signature = "ss")
-       def WriteString (self, key, value):
+       def SetString (self, key, value):
                pass
 
        @method (in_signature = "si")
-       def WriteInt (self, key, value):
+       def SetInt (self, key, value):
                pass
 
        @method (in_signature = "sb")
-       def WriteBool (self, key, value):
+       def SetBool (self, key, value):
+               pass
+
+       @signal (signature = "sv")
+       def ValueChanged (self, key, value):
                pass
 

diff --git a/ibus/interface/iibus.py b/ibus/interface/iibus.py
index a196acb890915e94f3f88228e9d47fdd07590184..56d4da647d1aaf9989f2016995a9aa4ace28c5be 100644 (file)
--- a/ibus/interface/iibus.py
+++ b/ibus/interface/iibus.py
@@ -78,6 +78,10 @@ class IIBus (dbus.service.Object):
        @method (in_signature = "ob")
        def RegisterPanel (self, object_path, replace, dbusconn): pass
 
+       # methods for ibus config
+       @method (in_signature = "ob")
+       def RegisterConfig (self, object_path, replace, dbusconn): pass
+
        # general methods
        @method (out_signature = "av")
        def GetFactories (self, dbusconn): pass
@@ -91,6 +95,24 @@ class IIBus (dbus.service.Object):
        @method (in_signature = "s", out_signature = "sb")
        def GetInputContextStates (self, ic, dbusconn): pass
 
+       @async_method (in_signature = "ss")
+       def ConfigSetString (self, key, value, dbusconn, reply_cb, error_cb): pass
+
+       @async_method (in_signature = "si")
+       def ConfigSetInt (self, key, value, dbusconn, reply_cb, error_cb): pass
+
+       @async_method (in_signature = "sb")
+       def ConfigSetBool (self, key, value, dbusconn, reply_cb, error_cb): pass
+
+       @async_method (in_signature = "s", out_signature = "s")
+       def ConfigGetString (self, key, dbusconn, reply_cb, error_cb): pass
+
+       @async_method (in_signature = "s", out_signature = "i")
+       def ConfigGetInt (self, key, dbusconn, reply_cb, error_cb): pass
+
+       @async_method (in_signature = "s", out_signature = "b")
+       def ConfigGetBool (self, key, dbusconn, reply_cb, error_cb): pass
+
        #sigals
        def CommitString (self, ic, text): pass
 
@@ -99,3 +121,5 @@ class IIBus (dbus.service.Object):
        def Enabled (self, ic): pass
 
        def Disabled (self, ic): pass
+
+       def ConfigValueChanged (self, key, value): pass