From c0fd76cd793aaf50443e0978bf2ff05020000d0a Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Fri, 14 Sep 2012 21:21:24 +0900
Subject: [PATCH] Added ibus-xx-segv-reg-prop.patch to avoid segv

---
 ibus-xx-segv-reg-prop.patch | 15 +++++++++++++++
 ibus.spec                   |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ibus-xx-segv-reg-prop.patch

diff --git a/ibus-xx-segv-reg-prop.patch b/ibus-xx-segv-reg-prop.patch
new file mode 100644
index 0000000..05c11a3
--- /dev/null
+++ b/ibus-xx-segv-reg-prop.patch
@@ -0,0 +1,15 @@
+--- ibus-1.4.99.20120914/bus/ibusimpl.c.orig	2012-09-14 21:11:37.627075831 +0900
++++ ibus-1.4.99.20120914/bus/ibusimpl.c	2012-09-14 21:12:41.632072691 +0900
+@@ -282,8 +282,10 @@ _dbus_name_owner_changed_cb (BusDBusImpl
+                 if (engine != NULL) {
+                     IBusPropList *prop_list =
+                         bus_engine_proxy_get_properties (engine);
+-                    bus_panel_proxy_register_properties (ibus->panel,
+-                                                         prop_list);
++                    if (prop_list) {
++                        bus_panel_proxy_register_properties (ibus->panel,
++                                                             prop_list);
++                    }
+                 }
+             }
+         }
diff --git a/ibus.spec b/ibus.spec
index e3a0594..80c1eec 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -30,7 +30,7 @@
 
 Name:       ibus
 Version:    1.4.99.20120914
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -39,6 +39,7 @@ Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz
 # Patch0:     ibus-HEAD.patch
+Patch0:     ibus-xx-segv-reg-prop.patch
 Patch1:     ibus-810211-no-switch-by-no-trigger.patch
 Patch2:     ibus-541492-xkb.patch
 Patch3:     ibus-530711-preload-sys.patch
@@ -211,6 +212,7 @@ zcat %SOURCE2 | tar xf -
 %endif
 
 # patch0 -p1
+%patch0 -p1
 %patch92 -p1 -b .g-s-preedit
 cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c ||
 %patch1 -p1 -b .noswitch
@@ -473,6 +475,9 @@ dconf update
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Sep 14 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120914-2
+- Added ibus-xx-segv-reg-prop.patch to avoid segv
+
 * Fri Sep 14 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20120914-1
 - Bumped to 1.4.99.20120914