diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2008-09-27 11:39:34 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-09-27 11:39:34 +0800 |
| commit | 7f04c7006bbe8d1526e2a32886947abbf02f1256 (patch) | |
| tree | 96c47c46302957f35c7e2d91810627cb22a3e67f | |
| parent | 9b481260aaa102070f0377050914d2e4d0031bbc (diff) | |
| download | ibus-7f04c7006bbe8d1526e2a32886947abbf02f1256.tar.gz ibus-7f04c7006bbe8d1526e2a32886947abbf02f1256.tar.xz ibus-7f04c7006bbe8d1526e2a32886947abbf02f1256.zip | |
Change internal gconf install location.
| -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: |