summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2016-12-22 15:38:45 +0800
committerPeng Wu <alexepico@gmail.com>2016-12-22 15:43:43 +0800
commit58353eb49f56ce43d7cdbb73c01aafa37a44b715 (patch)
treeb4fcad85a53d353570281ba4ff9f4d8f4ef733af
parent304f93870f0d2fc7b0880c9465e2585bf200dd4e (diff)
downloadibus-libpinyin-58353eb49f56ce43d7cdbb73c01aafa37a44b715.tar.gz
ibus-libpinyin-58353eb49f56ce43d7cdbb73c01aafa37a44b715.tar.xz
ibus-libpinyin-58353eb49f56ce43d7cdbb73c01aafa37a44b715.zip
use icon_prop_key property
-rw-r--r--configure.ac17
-rw-r--r--src/libpinyin.xml.in.in2
2 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 828b7b7..78dc905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,23 @@ AC_ARG_WITH(python,
)
AM_PATH_PYTHON([2.5])
+# check icon_prop_key in IBus.EngineDesc
+AC_MSG_CHECKING([if IBus.EngineDesc has get_icon_prop_key])
+ICON_PROP_KEY_TEST="import gi
+gi.require_version('IBus', '1.0')
+from gi.repository import IBus
+exit(not hasattr(IBus.EngineDesc, 'get_icon_prop_key'))
+"
+$PYTHON -c "$ICON_PROP_KEY_TEST"
+if test $? -eq 0; then
+ ICON_PROP_KEY_XML="<icon_prop_key>InputMode</icon_prop_key>"
+ AC_MSG_RESULT([yes])
+else
+ ICON_PROP_KEY_XML="<!-- <icon_prop_key>InputMode</icon_prop_key> -->"
+ AC_MSG_RESULT([ibus 1.5.11 or later supports icon-prop-key in IBus.EngineDesc])
+fi
+AC_SUBST(ICON_PROP_KEY_XML)
+
# --enable-boost
AC_ARG_ENABLE(boost,
AC_HELP_STRING([--enable-boost],
diff --git a/src/libpinyin.xml.in.in b/src/libpinyin.xml.in.in
index 4f66f07..a629e85 100644
--- a/src/libpinyin.xml.in.in
+++ b/src/libpinyin.xml.in.in
@@ -26,6 +26,7 @@
<description>Intelligent Pinyin input method</description>
<rank>99</rank>
<symbol>&#x62FC;</symbol>
+ @ICON_PROP_KEY_XML@
<setup>${libexecdir}/ibus-setup-libpinyin libpinyin</setup>
</engine>
<engine>
@@ -43,6 +44,7 @@
<description>Bopomofo input method</description>
<rank>98</rank>
<symbol>&#x3109;</symbol>
+ @ICON_PROP_KEY_XML@
<setup>${libexecdir}/ibus-setup-libpinyin libbopomofo</setup>
</engine>
</engines>