rpms/gnome-desktop/devel rr-leaks.patch, NONE, 1.1 gnome-desktop.spec, 1.156, 1.157

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22059

Modified Files:
	gnome-desktop.spec 
Added Files:
	rr-leaks.patch 
Log Message:
fix more leaks


rr-leaks.patch:

--- NEW FILE rr-leaks.patch ---
diff -up gnome-desktop-2.23.90/libgnome-desktop/gnome-rr-config.c.rr-leaks gnome-desktop-2.23.90/libgnome-desktop/gnome-rr-config.c
--- gnome-desktop-2.23.90/libgnome-desktop/gnome-rr-config.c.rr-leaks	2008-08-18 16:09:40.000000000 -0400
+++ gnome-desktop-2.23.90/libgnome-desktop/gnome-rr-config.c	2008-08-30 11:34:52.000000000 -0400
@@ -186,7 +186,7 @@ handle_start_element (GMarkupParseContex
 	
 	parser->configuration = g_new0 (GnomeRRConfig, 1);
 	parser->configuration->clone = FALSE;
-	parser->configuration->outputs = g_new0 (GnomeOutputInfo *, 1);
+	parser->configuration->outputs = NULL;
     }
     else if (strcmp (name, "monitors") == 0)
     {
@@ -656,6 +656,8 @@ outputs_free (GnomeOutputInfo **outputs)
 
     for (i = 0; outputs[i] != NULL; ++i)
 	output_free (outputs[i]);
+
+    g_free (outputs);
 }
 
 void
diff -up gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c.rr-leaks gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c
--- gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c.rr-leaks	2008-08-30 11:34:52.000000000 -0400
+++ gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c	2008-08-30 11:34:52.000000000 -0400
@@ -719,6 +719,11 @@ output_initialize (GnomeRROutput *output
 static void
 output_free (GnomeRROutput *output)
 {
+    g_free (output->clones);
+    g_free (output->modes);
+    g_free (output->possible_crtcs);
+    g_free (output->edid_data);
+    g_free (output->name);
     g_free (output);
 }
 


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnome-desktop.spec	29 Aug 2008 22:38:32 -0000	1.156
+++ gnome-desktop.spec	30 Aug 2008 16:28:36 -0000	1.157
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -23,6 +23,8 @@
 Patch0: gnome-desktop-2.23.90-eedid.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=549876
 Patch1: gnome-bg-leak.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=549960
+Patch2: rr-leaks.patch
 
 Requires: redhat-menus
 Requires: pycairo
@@ -77,6 +79,7 @@
 %setup -q
 %patch0 -p1 -b .eedid
 %patch1 -p0 -b .gnome-bg-leak
+%patch2 -p1 -b .rr-leaks
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -122,6 +125,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-5
+- Plug more memory leaks
+
 * Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-4
 - Plug a memory leak