From 3a364cd60287935ae0cb46bc67c601fdb2bdabd0 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 16 Jun 2004 21:39:54 +0000 Subject: [PATCH] Merge from HEAD: 2004-06-16 Federico Mena Quintero Merge from HEAD: * gtk/gtkfilesystemmodel.c (do_files_added): When inserting a visible node, free the old path before creating the new one. Fixes #144356. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkfilesystemmodel.c | 1 + 5 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2fce4ec3bc..e6ff5f6a65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-06-16 Federico Mena Quintero + + Merge from HEAD: + + * gtk/gtkfilesystemmodel.c (do_files_added): When inserting a + visible node, free the old path before creating the new one. + Fixes #144356. + Tue Jun 15 01:10:32 2004 Matthias Clasen * gtk/gtkcombobox.c: Make GtkComboBox work without model. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2fce4ec3bc..e6ff5f6a65 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-06-16 Federico Mena Quintero + + Merge from HEAD: + + * gtk/gtkfilesystemmodel.c (do_files_added): When inserting a + visible node, free the old path before creating the new one. + Fixes #144356. + Tue Jun 15 01:10:32 2004 Matthias Clasen * gtk/gtkcombobox.c: Make GtkComboBox work without model. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2fce4ec3bc..e6ff5f6a65 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-06-16 Federico Mena Quintero + + Merge from HEAD: + + * gtk/gtkfilesystemmodel.c (do_files_added): When inserting a + visible node, free the old path before creating the new one. + Fixes #144356. + Tue Jun 15 01:10:32 2004 Matthias Clasen * gtk/gtkcombobox.c: Make GtkComboBox work without model. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2fce4ec3bc..e6ff5f6a65 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-06-16 Federico Mena Quintero + + Merge from HEAD: + + * gtk/gtkfilesystemmodel.c (do_files_added): When inserting a + visible node, free the old path before creating the new one. + Fixes #144356. + Tue Jun 15 01:10:32 2004 Matthias Clasen * gtk/gtkcombobox.c: Make GtkComboBox work without model. diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 5927983ca2..2a5b4403e4 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -1607,6 +1607,7 @@ do_files_added (GtkFileSystemModel *model, if (new->is_visible) { iter.user_data = new; + gtk_file_path_free (path); path = gtk_tree_model_get_path (tree_model, &iter); gtk_tree_model_row_inserted (tree_model, path, &iter);