[PC-BSD Commits] r6110 - pcbsd/trunk/system-overlay/usr/local/kde4/env

[svn at pcbsd.org]

Author: ayerenkow
Date: 2010-01-30 03:27:03 -0800 (Sat, 30 Jan 2010)
New Revision: 6110

Modified:
   pcbsd/trunk/system-overlay/usr/local/kde4/env/enable-ibus.sh
Log:
Fix iBus for PBI, credits to Yamashiro-san

Modified: pcbsd/trunk/system-overlay/usr/local/kde4/env/enable-ibus.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/kde4/env/enable-ibus.sh	2010-01-30 10:04:29 UTC (rev 6109)
+++ pcbsd/trunk/system-overlay/usr/local/kde4/env/enable-ibus.sh	2010-01-30 11:27:03 UTC (rev 6110)
@@ -24,8 +24,15 @@
 # If we are using ibus, set vars and enable daemon
 if [ "${ENABLE}" = "YES" ]
 then
-  GTK_IM_MODULE="ibus" ; export GTK_IM_MODULE
+  # In some PBI, iBus GTK IM module makes GTK version mismatch error
+  # with GTK libraries included in the PBI package.
+  #GTK_IM_MODULE="ibus" ; export GTK_IM_MODULE
+ 
   QT_IM_MODULE="ibus" ; export QT_IM_MODULE
   XMODIFIERS="@im=ibus" ; export XMODIFIERS
-  /usr/local/bin/ibus-daemon --daemonize --xim &
+
+  # For PBI applications
+  GTK_IM_MODULE="xim" ; export GTK_IM_MODULE
+  GTK_IM_MODULE_FILE=/usr/local/etc/gtk-2.0/gtk.immodules ; export GTK_IM_MODULE_FILE
+    /usr/local/bin/ibus-daemon --daemonize --xim &
 fi