diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2012-03-05 13:25:53 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2012-03-05 13:25:53 +0900 |
| commit | f1c010f6b5a56e21b78e5ea97aea263b95d7e540 (patch) | |
| tree | b113860b8229e8589be2efbc4331d50049709a47 | |
| parent | e786c06a6676c46dff74c2fcdd81948226625a42 (diff) | |
| download | ibus-f1c010f6b5a56e21b78e5ea97aea263b95d7e540.tar.gz | |
Fix python library to load libibus.so.Y
TEST=Linux desktop
Review URL: https://codereview.appspot.com/5731060
| -rw-r--r-- | ibus/_config.py.in | 2 | ||||
| -rw-r--r-- | ibus/common.py | 3 | ||||
| -rw-r--r-- | ui/gtk3/Makefile.am | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/ibus/_config.py.in b/ibus/_config.py.in index 098d805a..c9d11bba 100644 --- a/ibus/_config.py.in +++ b/ibus/_config.py.in @@ -25,6 +25,7 @@ __all__ = ( "get_copyright", "get_license", "get_ICON_KEYBOARD", + "LIBIBUS_SONAME", "ISOCODES_PREFIX", "_" ) @@ -55,4 +56,5 @@ def get_ICON_KEYBOARD(): return fallback_icon return icon +LIBIBUS_SONAME='libibus-@IBUS_API_VERSION@.so.@LT_CURRENT_MINUS_AGE@' ISOCODES_PREFIX='@ISOCODES_PREFIX@' diff --git a/ibus/common.py b/ibus/common.py index 6483aaed..fb39d564 100644 --- a/ibus/common.py +++ b/ibus/common.py @@ -59,6 +59,7 @@ import os import sys from xdg import BaseDirectory import ctypes +import _config # __display = os.environ["DISPLAY"] # __hostname, __display_screen = __display.split(":", 1) @@ -104,7 +105,7 @@ import ctypes # return None # return address -libibus = ctypes.CDLL("libibus-1.0.so.0") +libibus = ctypes.CDLL(_config.LIBIBUS_SONAME) get_address = libibus.ibus_get_address get_address.restype=ctypes.c_char_p diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am index 5b75e73a..0fb9d3c6 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am @@ -82,7 +82,7 @@ AM_VALAFLAGS = \ libexec_PROGRAMS = ibus-ui-gtk3 -ibus_ui_gtk3_valas = \ +ibus_ui_gtk3_SOURCES = \ application.vala \ candidatearea.vala \ candidatepanel.vala \ @@ -94,11 +94,6 @@ ibus_ui_gtk3_valas = \ property.vala \ separator.vala \ switcher.vala \ - $(NULL) -ibus_ui_gtk3_vala_cfiles = $(ibus_ui_gtk3_valas:.vala=.c) - -ibus_ui_gtk3_SOURCES = \ - $(ibus_ui_gtk3_valas) \ grabkeycode.c \ $(NULL) @@ -108,7 +103,6 @@ ibus_ui_gtk3_LDADD = \ CLEANFILES = \ gtkpanel.xml \ - $(ibus_ui_gtk3_vala_cfiles) \ $(NULL) EXTRA_DIST = \ |