diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-09-27 11:40:03 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-09-27 11:40:03 +0800 |
| commit | 4b20a204d7ce986f2ef407374320c8a3617ce582 (patch) | |
| tree | 00ad50508ede19121a0644b13f51ac5877d2aec0 | |
| parent | 593ad4302ffb76aa148dd64da8df490c710b88c5 (diff) | |
| parent | 7f04c7006bbe8d1526e2a32886947abbf02f1256 (diff) | |
| download | ibus-4b20a204d7ce986f2ef407374320c8a3617ce582.tar.gz ibus-4b20a204d7ce986f2ef407374320c8a3617ce582.tar.xz ibus-4b20a204d7ce986f2ef407374320c8a3617ce582.zip | |
Merge branch 'master' into implement_dbus
| -rw-r--r-- | gconf/config.py | 5 | ||||
| -rw-r--r-- | util/gconf/Makefile.am | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gconf/config.py b/gconf/config.py index d36fe14..ac46e0a 100644 --- a/gconf/config.py +++ b/gconf/config.py @@ -24,7 +24,10 @@ __all__ = ( ) import gobject -import gconf +try: + import gconf +except: + from ibus import gconf import dbus import ibus from ibus import interface diff --git a/util/gconf/Makefile.am b/util/gconf/Makefile.am index b3f7b74..5c4b0ea 100644 --- a/util/gconf/Makefile.am +++ b/util/gconf/Makefile.am @@ -3,13 +3,13 @@ INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) defsdir = $(datadir)/pygtk/2.0/defs if IBUS_BUILD_PYGCONF -defs_DATA = gconf.defs +# defs_DATA = gconf.defs endif common_ldflags = -module -avoid-version $(PYTHON_LDFLAGS) -pkgpythondir = $(pyexecdir)/gtk-2.0 -pkgpyexecdir = $(pyexecdir)/gtk-2.0 +# pkgpythondir = $(pyexecdir)/gtk-2.0 +# pkgpyexecdir = $(pyexecdir)/gtk-2.0 # gconf binding @@ -33,7 +33,7 @@ gconf.c: gconf.defs gconf.override gconf-arg-types.py argtypesdir = $(datadir)/pygtk/2.0/argtypes if IBUS_BUILD_PYGCONF -argtypes_PYTHON = gconf-arg-types.py +# argtypes_PYTHON = gconf-arg-types.py endif .defs.c: |