Accepting request 234941 from home:tiwai:branches:M17N

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

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

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,9 @@
+-------------------------------------------------------------------
+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
 

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