--- a/ChangeLog	Thu May 31 05:31:02 2012 +0000
+++ b/ChangeLog	Thu May 31 05:33:33 2012 +0000
@@ -1,3 +1,9 @@
+2012-05-31  Ginn Chen  <[email protected]>
+	RTI#363524
+	7164818 firefox crashes when closing it after run ibus-daemon
+	* base-specs/gtk2.spec:
+	* patches/gtk+-20-xim-info-display-closed-crash.diff:
+
 2012-05-30  Ghee Teo  <[email protected]>
 
 	RTI#363433 fixes

--- a/base-specs/gtk2.spec	Thu May 31 05:31:02 2012 +0000
+++ b/base-specs/gtk2.spec	Thu May 31 05:33:33 2012 +0000
@@ -60,6 +60,8 @@
 Patch18:       gtk+-18-remove-papi.diff
 # date:2012-03-27 owner:padraig type:bug bugster:7149817
 Patch19:       gtk+-19-unregister-callback.diff
+# date:2012-05-30 owner:ginnchen type:bug bugster:7164818
+Patch20:       gtk+-20-xim-info-display-closed-crash.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -147,6 +149,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %build
 %ifos linux

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk+-20-xim-info-display-closed-crash.diff	Thu May 31 05:33:33 2012 +0000
@@ -0,0 +1,14 @@
+--- gtk+-2.20.1/modules/input/gtkimcontextxim.c.orig
++++ gtk+-2.20.1/modules/input/gtkimcontextxim.c
+@@ -1874,11 +1874,10 @@ gtk_im_context_xim_shutdown (void)
+     status_window_free (status_windows->data);
+ 
+   while (open_ims)
+     {
+       GtkXIMInfo *info = open_ims->data;
+       GdkDisplay *display = gdk_screen_get_display (info->screen);
+ 
+       xim_info_display_closed (display, FALSE, info);
+-      open_ims = g_slist_remove_link (open_ims, open_ims);
+     }
+ }