(shortcuts_add_current_folder): Don't leak volume. (#155400,

	Morten Welinder)

ChangeLog

@@ -4,6 +4,8 @@
 	get text unnecessarily.  (#155384, Morten Welinder)
 	(gtk_file_chooser_default_finalize): Don't forget to
 	unref the tooltips.  (#155412, Morten Welinder)
+	(shortcuts_add_current_folder): Don't leak volume. (#155400,
+	Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

ChangeLog.pre-2-10

@@ -4,6 +4,8 @@
 	get text unnecessarily.  (#155384, Morten Welinder)
 	(gtk_file_chooser_default_finalize): Don't forget to
 	unref the tooltips.  (#155412, Morten Welinder)
+	(shortcuts_add_current_folder): Don't leak volume. (#155400,
+	Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

ChangeLog.pre-2-6

@@ -4,6 +4,8 @@
 	get text unnecessarily.  (#155384, Morten Welinder)
 	(gtk_file_chooser_default_finalize): Don't forget to
 	unref the tooltips.  (#155412, Morten Welinder)
+	(shortcuts_add_current_folder): Don't leak volume. (#155400,
+	Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

ChangeLog.pre-2-8

@@ -4,6 +4,8 @@
 	get text unnecessarily.  (#155384, Morten Welinder)
 	(gtk_file_chooser_default_finalize): Don't forget to
 	unref the tooltips.  (#155412, Morten Welinder)
+	(shortcuts_add_current_folder): Don't leak volume. (#155400,
+	Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

gtk/gtkfilechooserdefault.c

@@ -1441,12 +1441,15 @@ shortcuts_add_current_folder (GtkFileChooserDefault *impl)
 	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
 	{
 	  success = shortcuts_insert_path (impl, pos, TRUE, volume, NULL, NULL, FALSE, NULL);
-	  if (!success)
-	    gtk_file_system_volume_free (impl->file_system, volume);
+	  if (success)
+	    volume = NULL;
 	}
       else
 	success = shortcuts_insert_path (impl, pos, FALSE, NULL, impl->current_folder, NULL, FALSE, NULL);
 
+      if (volume)
+	gtk_file_system_volume_free (impl->file_system, volume);
+
       if (base_path)
 	gtk_file_path_free (base_path);