[rpms/ibus] autotool: Added ibus-1136623-lost-by-another-focus.patch to fix #1136623

[rpms/ibus] autotool: Added ibus-1136623-lost-by-another-focus.patch to fix #1136623

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 99c3e74f6675834b4b94ae9773c86fb514e0eb67
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2014-12-08T19:50:58+09:00
Stats  : +31/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/99c3e74f6675834b4b94ae9773c86fb514e0eb67?branch=autotool

Log:
Added ibus-1136623-lost-by-another-focus.patch to fix #1136623

---
diff --git a/ibus-1136623-lost-by-another-focus.patch b/ibus-1136623-lost-by-another-focus.patch
new file mode 100644
index 0000000..93bf76b
--- /dev/null
+++ b/ibus-1136623-lost-by-another-focus.patch
@@ -0,0 +1,24 @@
+--- ibus-1.5.8/client/gtk2/ibusimcontext.c.orig	2014-10-16 18:35:07.229056767 +0900
++++ ibus-1.5.8/client/gtk2/ibusimcontext.c	2014-10-17 12:36:29.138998318 +0900
+@@ -857,12 +857,7 @@ ibus_im_context_focus_in (GtkIMContext *
+         }
+     }
+ 
+-    if (_focus_im_context != NULL) {
+-        g_assert (_focus_im_context != context);
+-        gtk_im_context_focus_out (_focus_im_context);
+-        g_assert (_focus_im_context == NULL);
+-    }
+-    else {
++    if (_focus_im_context == NULL) {
+         /* focus out fake context */
+         if (_fake_context != NULL) {
+             ibus_input_context_focus_out (_fake_context);
+@@ -903,7 +898,6 @@ ibus_im_context_focus_out (GtkIMContext
+         return;
+     }
+ 
+-    g_assert (context == _focus_im_context);
+     g_object_remove_weak_pointer ((GObject *) context,
+                                   (gpointer *) &_focus_im_context);
+     _focus_im_context = NULL;

diff --git a/ibus.spec b/ibus.spec
index 6fbea72..cac6a8e 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -28,7 +28,7 @@
 
 Name:           ibus
 Version:        1.5.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 Group:          System Environment/Libraries
@@ -41,6 +41,7 @@ Source3:        https://fujiwara.fedorapeople.org/ibus/po/%{name}-po-%{version}-
 # Patch0:         %%{name}-HEAD.patch
 Patch0:         %{name}-HEAD.patch
 Patch1:         %{name}-xx-increase-timeout.patch
+Patch2:         %{name}-1136623-lost-by-another-focus.patch
 
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
@@ -224,7 +225,9 @@ zcat %SOURCE3 | tar xfv -
 # %%patch0 -p1
 %patch0 -p1
 %patch1 -p1 -b .tmout
+%patch2 -p1 -b .fout
 # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
+cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
 
 %build
 #autoreconf -f -i -v
@@ -411,6 +414,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Dec 08 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-7
+- Added ibus-1136623-lost-by-another-focus.patch to fix #1136623
+
 * Mon Dec 08 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-6
 - Updated ibus-xx-increase-timeout.patch to fix #1163722
 - Updated ibus-HEAD.patch for upstream #1747, #1748, #1753