rpms/gtk2/devel gail-leaks.patch, NONE, 1.1 info-leak.patch, NONE, 1.1 gtk2.spec, 1.323, 1.324

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18712

Modified Files:
	gtk2.spec 
Added Files:
	gail-leaks.patch info-leak.patch 
Log Message:
add patches


gail-leaks.patch:

--- NEW FILE gail-leaks.patch ---
diff -up gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailcell.c
--- gtk+-2.14.2/modules/other/gail/gailcell.c.gail-leaks	2008-09-19 00:55:50.000000000 -0400
+++ gtk+-2.14.2/modules/other/gail/gailcell.c	2008-09-19 00:56:24.000000000 -0400
@@ -118,6 +118,7 @@ gail_cell_destroyed (GtkWidget       *wi
    * GtkWidget. We set the  pointer location to NULL;
    */
   cell->widget = NULL;
+  g_signal_handlers_disconnect_by_func (widget, gail_cell_destroyed, cell);
 }
 
 static void
diff -up gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks gtk+-2.14.2/modules/other/gail/gailtreeview.c
--- gtk+-2.14.2/modules/other/gail/gailtreeview.c.gail-leaks	2008-09-19 00:55:02.000000000 -0400
+++ gtk+-2.14.2/modules/other/gail/gailtreeview.c	2008-09-19 00:55:39.000000000 -0400
@@ -3667,12 +3667,12 @@ static gboolean
 garbage_collect_cell_data (gpointer data)
 {
       GailTreeView *tree_view;
-      GList *temp_list;
+      GList *temp_list, *list;
       GailTreeViewCellInfo *cell_info;
 
       g_assert (GAIL_IS_TREE_VIEW (data));
       tree_view = (GailTreeView *)data;
-      temp_list = g_list_copy (tree_view->cell_data);
+      list = g_list_copy (tree_view->cell_data);
 
       tree_view->garbage_collection_pending = FALSE;
       if (tree_view->idle_garbage_collect_id != 0) 
@@ -3682,6 +3682,7 @@ garbage_collect_cell_data (gpointer data
       }
 
       /* Must loop through them all */
+      temp_list = list;
       while (temp_list != NULL)
       {
           cell_info = temp_list->data;
@@ -3696,7 +3697,7 @@ garbage_collect_cell_data (gpointer data
 	  }
           temp_list = temp_list->next;
       }
-      g_list_free (temp_list);
+      g_list_free (list);
 
       return tree_view->garbage_collection_pending;
 }

info-leak.patch:

--- NEW FILE info-leak.patch ---
diff -up gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c
--- gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c.info-leak	2008-09-18 14:34:02.000000000 -0400
+++ gtk+-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c	2008-09-18 14:34:46.000000000 -0400
@@ -688,9 +688,10 @@ gdk_pixbuf_load_module_unlocked (GdkPixb
         if (fill_vtable) {
 		image_module->module = (void *) 1;
                 (* fill_vtable) (image_module);
-		image_module->info = g_new0 (GdkPixbufFormat, 1);
-		(* fill_info) (image_module->info);
-
+		if (image_module->info == NULL) {
+			image_module->info = g_new0 (GdkPixbufFormat, 1);
+			(* fill_info) (image_module->info);
+		}
                 return TRUE;
 	}
 	else 


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- gtk2.spec	22 Sep 2008 15:47:12 -0000	1.323
+++ gtk2.spec	22 Sep 2008 15:50:08 -0000	1.324
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,7 +30,9 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# fixed upstream
 Patch3: info-leak.patch
+# fixed upstream
 Patch4: gail-leaks.patch
 
 BuildRequires: atk-devel >= %{atk_version}
@@ -303,8 +305,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
-* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+* Mon Sep 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-3
 - BR libXdamage-devel (#462971, Owen Taylor)
+- Plug some memory leaks
 
 * Thu Sep 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2