rpms/gnome-desktop/devel gnome-bg-leak.patch, NONE, 1.1 gnome-desktop.spec, 1.155, 1.156

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-desktop.spec 
Added Files:
	gnome-bg-leak.patch 
Log Message:
plug a leak


gnome-bg-leak.patch:

--- NEW FILE gnome-bg-leak.patch ---
Index: libgnome-desktop/gnome-bg.c
===================================================================
--- libgnome-desktop/gnome-bg.c	(revision 5202)
+++ libgnome-desktop/gnome-bg.c	(working copy)
@@ -341,6 +341,8 @@
 	gnome_bg_set_color (bg, ctype, &c1, &c2);
 	gnome_bg_set_placement (bg, placement);
 	gnome_bg_set_filename (bg, filename);
+
+	g_free (filename);
 }
 
 void
@@ -514,8 +516,6 @@
 gnome_bg_set_filename (GnomeBG     *bg,
 		       const char  *filename)
 {
-	char *free_me = NULL;
-	
 	g_return_if_fail (bg != NULL);
 	
 	if (is_different (bg, filename)) {
@@ -545,8 +545,6 @@
 		
 		queue_changed (bg);
 	}
-
-	g_free (free_me);
 }
 
 static void


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-desktop.spec	25 Aug 2008 17:52:00 -0000	1.155
+++ gnome-desktop.spec	29 Aug 2008 22:38:32 -0000	1.156
@@ -12,14 +12,17 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# fixed upstream
 Patch0: gnome-desktop-2.23.90-eedid.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=549876
+Patch1: gnome-bg-leak.patch
 
 Requires: redhat-menus
 Requires: pycairo
@@ -73,6 +76,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .eedid
+%patch1 -p0 -b .gnome-bg-leak
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -118,6 +122,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Aug 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.90-4
+- Plug a memory leak
+
 * Mon Aug 25 2008 Adam Jackson <ajax at redhat.com> 2.23.90-3
 - gnome-desktop-2.23.90-eedid.patch: Allow E-EDID blocks.