Merge from HEAD:

2004-06-16  Federico Mena Quintero  <federico@ximian.com>

	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.
This commit is contained in:
Federico Mena Quintero
2004-06-16 21:39:54 +00:00
committed by Federico Mena Quintero
parent 0ed32754f4
commit 3a364cd602
5 changed files with 33 additions and 0 deletions

View File

@@ -1,3 +1,11 @@
2004-06-16 Federico Mena Quintero <federico@ximian.com>
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 <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.

View File

@@ -1,3 +1,11 @@
2004-06-16 Federico Mena Quintero <federico@ximian.com>
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 <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.

View File

@@ -1,3 +1,11 @@
2004-06-16 Federico Mena Quintero <federico@ximian.com>
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 <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.

View File

@@ -1,3 +1,11 @@
2004-06-16 Federico Mena Quintero <federico@ximian.com>
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 <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.

View File

@@ -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);