[maemo-commits] [maemo-commits] r18734 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-06-16 17:04:04 +0300 (Tue, 16 Jun 2009)
New Revision: 18734

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkimmulticontext.c
Log:
2009-06-16  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#121544 - Memory leaks found when trying to delete contact(s)

	* gtk/gtkimmulticontext.c (gtk_im_multicontext_get_slave): free
	global_context_id.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-06-16 06:44:44 UTC (rev 18733)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-06-16 14:04:04 UTC (rev 18734)
@@ -1,3 +1,10 @@
+2009-06-16  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#121544 - Memory leaks found when trying to delete contact(s)
+
+	* gtk/gtkimmulticontext.c (gtk_im_multicontext_get_slave): free
+	global_context_id.
+
 2009-06-15  Christian Dywan  <christian at lanedo.com>
 
 	* gtk/gtkmenu.c (gtk_menu_window_event):

Modified: projects/haf/trunk/gtk+/gtk/gtkimmulticontext.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkimmulticontext.c	2009-06-16 06:44:44 UTC (rev 18733)
+++ projects/haf/trunk/gtk+/gtk/gtkimmulticontext.c	2009-06-16 14:04:04 UTC (rev 18734)
@@ -382,6 +382,10 @@
 
       g_free (multicontext->context_id);
       multicontext->context_id = g_strdup (global_context_id);
+
+#ifdef MAEMO_CHANGES
+      g_free (global_context_id);
+#endif /* MAEMO_CHANGES */
     }
 
   return multicontext->slave;