gnome-desktop r5205 - trunk/libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Mon Sep  1 21:19:48 2008
New Revision: 5205
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5205&view=rev

Log:
2008-09-01  Vincent Untz  <vuntz gnome org>

	* gnome-bg.c: (gnome_bg_load_from_preferences): fix leak
	(gnome_bg_set_filename): remove useless code
	Patch by Matthias Clasen <mclasen redhat com>
	Fix bug #549876


Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-bg.c

Modified: trunk/libgnome-desktop/gnome-bg.c
==============================================================================
--- trunk/libgnome-desktop/gnome-bg.c	(original)
+++ trunk/libgnome-desktop/gnome-bg.c	Mon Sep  1 21:19:48 2008
@@ -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