[maemo-commits] [maemo-commits] r9363 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . modules/input

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-26 15:38:34 +0200 (Fri, 26 Jan 2007)
New Revision: 9363

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/modules/input/gtkimcontextxim.c
Log:
2007-01-26  Michael Natterer  <mitch at imendio.com>

	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
	destroy the XIM only if it exists (applied the same fix to
	upstream trunk).



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-26 12:33:30 UTC (rev 9362)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-26 13:38:34 UTC (rev 9363)
@@ -1,3 +1,9 @@
+2007-01-26  Michael Natterer  <mitch at imendio.com>
+
+	* modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize):
+	destroy the XIM only if it exists (applied the same fix to
+	upstream trunk).
+
 Wed Jan 24 14:26:29 2007  Tim Janik  <timj at imendio.com>
 
 	* Backports:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/modules/input/gtkimcontextxim.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/modules/input/gtkimcontextxim.c	2007-01-26 12:33:30 UTC (rev 9362)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/modules/input/gtkimcontextxim.c	2007-01-26 13:38:34 UTC (rev 9363)
@@ -577,7 +577,7 @@
 					    xim_instantiate_callback,
 					    (XPointer)context_xim->im_info);
 	}
-      else
+      else if (context_xim->im_info->im)
 	{
 	  XIMCallback im_destroy_callback;