diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2005-06-07 21:24:19 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2005-06-07 21:24:19 +0000 |
| commit | 471b638bd309a70cc392e42e48b38cdc4c283393 (patch) | |
| tree | 0db852d85f17eb7fb84c4e3f2afe2d327dccbe61 | |
| parent | 06606b57009f5731b9a0de6cdb54cd1b03cba734 (diff) | |
| download | gtk+-471b638bd309a70cc392e42e48b38cdc4c283393.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 2 |
4 files changed, 17 insertions, 0 deletions
@@ -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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index baf8688ec0..23b1b708c5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index baf8688ec0..23b1b708c5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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 diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 3c38073db0..1b443462ec 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -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; |