Accepting request 254748 from home:ftake:branches:M17N

update and fix for 13.2

OBS-URL: https://build.opensuse.org/request/show/254748
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=130

xim.d-ibus-121

@@ -1,9 +1,5 @@
-OLD_PATH=$PATH
-PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH
-
 if ! type -p ibus-daemon > /dev/null 2>&1 ; then
     echo "ibus is not available."
-    PATH=$OLD_PATH
     return 1
 fi
 
@@ -11,22 +7,6 @@ case "$WINDOWMANAGER" in
     #when skim installed, Autostart must be "false".
     #here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
     *kde*)
-        if type -p skim > /dev/null 2>&1 \
-          && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc
-        then
-            if [ -f $HOME/.kde/share/config/skimrc.orig.ibus ] ; then
-               mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.ibus
-               chmod 777 $HOME/.kde/share/config/skimrc.orig.ibus
-            fi
-        cat > $HOME/.kde/share/config/skimrc << __END
-[General]
-Autostart=false
-__END
-        chmod 777 $HOME/.kde/share/config/skimrc
-        else
-        # do nothing
-    	:
-        fi
     ;;
     # GNOME 3 Settings Daemon keyboard plugin manages all ibus settings itself,
     # so don't do manual setup&startup of ibus otherwise it would conflict with
@@ -56,11 +36,16 @@ __END
 esac
 
 # Force OOo to use gtk-immodule
-# Better way to fix cursor following problem (on_the_spot bug) under libreoffice-kde4
-export OOO_FORCE_DESKTOP=gnome
-
-# Determine the LC_CTYPE locale category setting
-#tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
+# Only libreoffice-gnome supports IM module
+# To fix cursor following problem (on_the_spot), do not use libreoffice-kde4
+if [ -e /usr/lib64/libreoffice/program/libvclplug_gtklo.so ] ||
+   [ -e /usr/lib/libreoffice/program/libvclplug_gtklo.so ] ||
+   [ -e /usr/lib64/libreoffice/program/libvclplug_gtk3lo.so ] ||
+   [ -e /usr/lib/libreoffice/program/libvclplug_gtk3lo.so ]; then
+    export OOO_FORCE_DESKTOP=gnome
+else
+    echo "libreoffice-gnome is not found. For better IBus support, please install libreoffice-gnome"
+fi
 
 export LC_CTYPE=$LANG
 export XMODIFIERS="@im=ibus" 
@@ -78,7 +63,5 @@ fi
 
 ibus-daemon --xim -d
 
-PATH=$OLD_PATH
-
 # success:
 return 0