Merge leak fix from stable. Bug 306754.

2005-06-07  Kjartan Maraas  <kmaraas@gnome.org>

	* gtk/gtkfilechooserbutton.c: (update_label_and_image):
	Merge leak fix from stable. Bug 306754.
This commit is contained in:
Kjartan Maraas 2005-06-07 21:24:19 +00:00 committed by Kjartan Maraas
parent 06606b5700
commit 471b638bd3
4 changed files with 17 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2005-06-07 Kjartan Maraas <kmaraas@gnome.org>
* gtk/gtkfilechooserbutton.c: (update_label_and_image):
Merge leak fix from stable. Bug 306754.
2005-06-05 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkscreen-win32.c

View File

@ -1,3 +1,8 @@
2005-06-07 Kjartan Maraas <kmaraas@gnome.org>
* gtk/gtkfilechooserbutton.c: (update_label_and_image):
Merge leak fix from stable. Bug 306754.
2005-06-05 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkscreen-win32.c

View File

@ -1,3 +1,8 @@
2005-06-07 Kjartan Maraas <kmaraas@gnome.org>
* gtk/gtkfilechooserbutton.c: (update_label_and_image):
Merge leak fix from stable. Bug 306754.
2005-06-05 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkscreen-win32.c

View File

@ -1828,6 +1828,8 @@ update_label_and_image (GtkFileChooserButton *button)
folder = gtk_file_system_get_folder (priv->fs,
parent_path ? parent_path : path,
GTK_FILE_INFO_DISPLAY_NAME, NULL);
gtk_file_path_free (parent_path);
if (folder)
{
GtkFileInfo *info;