diff options
| author | Alexandre Rostovtsev <tetromino@gmail.com> | 2011-08-29 23:05:11 -0400 |
|---|---|---|
| committer | Eitan Isaacson <eitan@monotonous.org> | 2011-08-31 09:19:27 -0700 |
| commit | 1857bd953dc02ac781991f0b97b488b4f300b01f (patch) | |
| tree | 49a4315bc8ef9b4c736e3f3e0410daa8cf39a335 /bin | |
| parent | f810f7bfa40fd53bbf2f47d628ad0f0279b24b72 (diff) | |
| download | caribou-1857bd953dc02ac781991f0b97b488b4f300b01f.tar.gz | |
Use GLib, GObject from gi.repository instead of glib, gobject
Use GLib and GObject from gi.repository instead of glib and gobject
modules for compatibility with pygobject-3.0. Otherwise, when running on
a system with pygobject-2.0 and pygobject-3.0 installed, caribou-preferences
fails with
ImportError: could not import gobject (error was: ImportError('When
using gi.repository you must not import static modules like "gobject".
Please change all occurrences of "import gobject" to "from gi.repository
import GObject".',))
https://bugzilla.gnome.org/show_bug.cgi?id=657666
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/antler-keyboard.in | 2 | ||||
| -rwxr-xr-x | bin/caribou-preferences.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in index 1b0c450..ce64128 100755 --- a/bin/antler-keyboard.in +++ b/bin/antler-keyboard.in @@ -25,7 +25,7 @@ exec_prefix=@exec_prefix@ if [ $script_dir == "@libexecdir@" ] then - datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in index 6aae29e..57772e7 100755 --- a/bin/caribou-preferences.in +++ b/bin/caribou-preferences.in @@ -25,7 +25,7 @@ exec_prefix=@exec_prefix@ if [ $script_dir == "@bindir@" ] then - datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" |