[rpms/ibus] autotool: Fixed Bug 678825 - SEGV in g_return_if_fail_warning.

[rpms/ibus] autotool: Fixed Bug 678825 - SEGV in g_return_if_fail_warning.

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : e582076b9a083417406c68d1308ef1d8a805357c
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2011-02-21T13:00:40+09:00
Stats  : +9/-26 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/e582076b9a083417406c68d1308ef1d8a805357c?branch=autotool

Log:
Fixed Bug 678825 - SEGV in g_return_if_fail_warning.

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index cdb4df4..571558d 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -94,29 +94,20 @@ index 88357af..9f593ab 100644
 -- 
 1.7.3.2
 
-From 6575fab67eaf6f8e483a001f26dbfd61c3258e0a Mon Sep 17 00:00:00 2001
+From 8ebad5f07b1ba821e278d4d04ab74e2d31a40139 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Thu, 17 Feb 2011 14:46:45 +0900
+Date: Sat, 19 Feb 2011 04:52:40 +0900
 Subject: [PATCH] Call gtk_key_snooper_remove when GTK IM client is switched.
 
 ---
- client/gtk2/ibusimcontext.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
+ client/gtk2/ibusimcontext.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index bb5ae5c..bb9cb3d 100644
+index bb5ae5c..c4ade53 100644
 --- a/client/gtk2/ibusimcontext.c
 +++ b/client/gtk2/ibusimcontext.c
-@@ -258,6 +258,8 @@ _key_snooper_cb (GtkWidget   *widget,
-     IBusIMContext *ibusimcontext = (IBusIMContext *) _focus_im_context;
-     IBusInputContext *ibuscontext = NULL;
- 
-+    g_return_val_if_fail (IBUS_IS_IM_CONTEXT (ibusimcontext), FALSE);
-+
-     if (ibusimcontext != NULL &&
-         ibusimcontext->has_focus == TRUE) {
-         /* has IC with focus and use_key_snooper is true */
-@@ -620,6 +622,12 @@ ibus_im_context_finalize (GObject *obj)
+@@ -620,6 +620,12 @@ ibus_im_context_finalize (GObject *obj)
          pango_attr_list_unref (ibusimcontext->preedit_attrs);
      }
  
@@ -129,15 +120,6 @@ index bb5ae5c..bb9cb3d 100644
      G_OBJECT_CLASS(parent_class)->finalize (obj);
  }
  
-@@ -631,6 +639,8 @@ ibus_im_context_filter_keypress (GtkIMContext *context,
- 
-     IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT (context);
- 
-+    g_return_val_if_fail (IBUS_IS_IM_CONTEXT (ibusimcontext), FALSE);
-+
-     if (G_LIKELY (ibusimcontext->ibuscontext && ibusimcontext->has_focus)) {
-         /* If context does not have focus, ibus will process key event in sync mode.
-          * It is a workaround for increase search in treeview.
 -- 
 1.7.4
 

diff --git a/ibus.spec b/ibus.spec
index 93375e9..ed70439 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -12,7 +12,7 @@
 
 Name:       ibus
 Version:    1.3.99.20110206
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -312,8 +312,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Feb 18 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110206-3
+* Mon Feb 21 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110206-4
 - Fixed Bug 677856 - left ibus snooper when im client is switched.
+- Fixed Bug 678825 - SEGV in g_return_if_fail_warning.
 
 * Mon Feb 14 2011 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20110206-1
 - Integrated the part of gjs in Bug 657165 ibus for gnome-shell.