Accepting request 234994 from M17N

- Fix the lost XIM input after GNOME screen lock (bnc#874969):
  ibus-xim-fix-re-focus-after-lock.patch (forwarded request 234941 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/234994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=51

ibus-xim-fix-re-focus-after-lock.patch

@@ -0,0 +1,16 @@
+---
+ client/x11/main.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/client/x11/main.c
++++ b/client/x11/main.c
+@@ -421,6 +421,9 @@ xim_set_ic_focus (XIMS xims, IMChangeFoc
+                                            GINT_TO_POINTER ((gint) call_data->icid));
+     g_return_val_if_fail (x11ic != NULL, 0);
+ 
++    /* make sure that focus has been already out */
++    ibus_input_context_focus_out (x11ic->context);
++
+     ibus_input_context_focus_in (x11ic->context);
+     _xim_set_cursor_location (x11ic);
+ 

ibus.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue May 20 15:28:40 CEST 2014 - tiwai@suse.de
+
+- Fix the lost XIM input after GNOME screen lock (bnc#874969):
+  ibus-xim-fix-re-focus-after-lock.patch
+
+-------------------------------------------------------------------
+Wed May 14 08:04:18 UTC 2014 - cxiong@suse.com
+
+- Let GNOME 3 handles ibus startup&setup. (bnc#873016)
+  * Changed xim.d-ibus-121.
+  * Reformatting the latter part of the xim.d-ibus-121.
+
 -------------------------------------------------------------------
 Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
 

ibus.spec

@@ -42,6 +42,8 @@ Patch2:         reload-preload-engines-until-users-customize-the-list.patch
 %endif
 # PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp
 Patch3:         show-input-mode-icon.patch
+# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
+Patch4:         ibus-xim-fix-re-focus-after-lock.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
@@ -188,6 +190,7 @@ rm -f data/dconf/00-upstream-settings
 %endif
 
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fi

xim.d-ibus-121

@@ -7,9 +7,9 @@ if ! type -p ibus-daemon > /dev/null 2>&1 ; then
     return 1
 fi
 
-#when skim installed, Autostart must be "false".
-#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
 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
@@ -28,6 +28,16 @@ __END
     	:
         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
+    # G-S-D. see bnc#873016.
+    *gnome-session*)
+        # make sure G-S-D keyboard plugin is active
+        echo "ibus will be managed by GNOME."
+        gsettings set org.gnome.settings-daemon.plugins.keyboard active true
+        PATH=$OLD_PATH
+        return 0
+    ;;
     *)
         # do nothing
     ;;
@@ -35,26 +45,26 @@ 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
+export OOO_FORCE_DESKTOP=gnome
 
 # Determine the LC_CTYPE locale category setting
 #tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
 
-            export LC_CTYPE=$LANG
-            export XMODIFIERS="@im=ibus" 
-            export GTK_IM_MODULE=ibus
-            export QT_IM_SWITCHER=imsw-multi
-            if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
-                    export QT_IM_MODULE=ibus
-            else
-                    export QT_IM_MODULE=xim
-            fi
+export LC_CTYPE=$LANG
+export XMODIFIERS="@im=ibus" 
+export GTK_IM_MODULE=ibus
+export QT_IM_SWITCHER=imsw-multi
+if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
+    export QT_IM_MODULE=ibus
+else
+    export QT_IM_MODULE=xim
+fi
 
-            if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
-                    eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null`
-            fi
+if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
+    eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null`
+fi
 
-            ibus-daemon --xim -d
+ibus-daemon --xim -d
 
 PATH=$OLD_PATH