Correctly pass iter to gtk_tree_model_rows_reordered() (#315704) Patch

2005-10-03  Alexander Larsson  <alexl@redhat.com>

	* src/file-manager/fm-list-model.c:
	(fm_list_model_sort_file_entries):
	Correctly pass iter to gtk_tree_model_rows_reordered() (#315704)
	Patch from Christian Neumair.

2 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ddb4510a1..4ab3c26ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-03  Alexander Larsson  <alexl@redhat.com>
 
+	* src/file-manager/fm-list-model.c:
+	(fm_list_model_sort_file_entries):
+	Correctly pass iter to gtk_tree_model_rows_reordered() (#315704)
+	Patch from Christian Neumair.
+
+2005-10-03  Alexander Larsson  <alexl@redhat.com>
+
 	* libnautilus-private/nautilus-directory-metafile.c:
 	(nautilus_directory_get_file_metadata):
 	On assert failure, return default metadata, not NULL.
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 32a9c5b23..e1f4a5e7c 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -572,10 +572,12 @@ static void
 fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePath *path)
 {
 	GSequencePtr *old_order;
+	GtkTreeIter iter;
 	int *new_order;
 	int length;
 	int i;
 	FileEntry *file_entry;
+	gboolean has_iter;
 
 	length = g_sequence_get_length (files);
 
@@ -611,8 +613,17 @@ fm_list_model_sort_file_entries (FMListModel *model, GSequence *files, GtkTreePa
 	/* Let the world know about our new order */
 
 	g_assert (new_order != NULL);
+
+	has_iter = FALSE;
+	if (gtk_tree_path_get_depth (path) != 0) {
+		gboolean get_iter_result;
+		has_iter = TRUE;
+		get_iter_result = gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);
+		g_assert (get_iter_result);
+	}
+
 	gtk_tree_model_rows_reordered (GTK_TREE_MODEL (model),
-				       path, NULL, new_order);
+				       path, has_iter ? &iter : NULL, new_order);
 
 	g_free (old_order);
 	g_free (new_order);