From 1e452ff156af438ef824cfa118685bfb419101ee Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Nov 18 2010 08:20:47 +0000
Subject: Fixed Bug 653806 - ibus-xkb SEGV


---

diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch
index 6254432..57e3e58 100644
--- a/ibus-541492-xkb.patch
+++ b/ibus-541492-xkb.patch
@@ -283,7 +283,7 @@ new file mode 100644
 index 0000000..0503f35
 --- /dev/null
 +++ b/ibus/xkblayout.py.in
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,190 @@
 +# vim:set et sts=4 sw=4:
 +#
 +# ibus - The Input Bus
@@ -396,6 +396,11 @@ index 0000000..0503f35
 +            return
 +        if layout == None:
 +            return
++        if self.__default_layout == None:
++            # Maybe opening display was failed in constructor.
++            self.reload_default_layout()
++        if self.__default_layout == None:
++            return
 +        layout = str(layout)
 +        if layout == "default":
 +            layout = self.__default_layout
@@ -2802,7 +2807,7 @@ new file mode 100644
 index 0000000..0919913
 --- /dev/null
 +++ b/xkb/ibus-xkb-main.c
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,105 @@
 +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 +/* vim:set et sts=4: */
 +/* bus - The Input Bus
@@ -2880,6 +2885,10 @@ index 0000000..0919913
 +    }
 +
 +    xdisplay = XOpenDisplay (NULL);
++    if (xdisplay == NULL) {
++        g_warning ("Could not open display");
++        return -1;
++    }
 +    ibus_xkb_init (xdisplay);
 +
 +    if (layout) {
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 975fc95..6106f3b 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -376,6 +376,17 @@ index 978b467..98fa1d1 100644
          self.__builder.add_from_file(gtk_builder_file);
          self.__bus = None
          self.__init_bus()
+--- ibus/setup/engineabout.py.orig	2010-11-16 17:53:20.970390287 +0900
++++ ibus/setup/engineabout.py	2010-11-16 17:53:44.781344317 +0900
+@@ -25,7 +25,7 @@ from gtk import gdk
+ import pango
+ import ibus
+ 
+-from i18n import *
++from i18n import _, N_
+ 
+ class EngineAbout(gtk.Dialog):
+     def __init__(self, enginedesc):
 diff --git a/ui/gtk/engineabout.py b/ui/gtk/engineabout.py
 index 3ac853a..a34e930 100644
 --- a/ui/gtk/engineabout.py
diff --git a/ibus.spec b/ibus.spec
index 9c9b368..b1ff3ea 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -12,7 +12,7 @@
 
 Name:       ibus
 Version:    1.3.99.20101028
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -310,7 +310,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Thu Nov 18 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101028-4
+* Thu Nov 18 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101028-5
 - Added ibus-652157-x11-ppc64.patch
   Fixed Bug 652157 - Window position of ibus-x11 in ppc64
 - Added ibus-530711-preload-sys.patch
@@ -320,6 +320,8 @@ fi
   Fixed undefined '_' in EngineAbout
   Fixed Bug 654260 - NULL of focused input context
 - Applied no-snooper for 'gnome-do,Do.*,firefox.*,.*chrome.*,.*chromium.*'
+- Updated ibus-541492-xkb.patch
+  Fixed Bug 653806 - ibus-xkb SEGV
 
 * Fri Oct 29 2010 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.99.20101028-1
 - Updated to 1.3.99.20101028