summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2005-11-08 22:30:23 +0000
committerMartin Wehner <mwehner@src.gnome.org>2005-11-08 22:30:23 +0000
commit9c496898bb1c0644a3a3d4ea14e36852b5f27077 (patch)
treeeabbbd991e7f2ad0d0984d64208317a5043e070f
parentae79dd881d2af4bebcd0f2fd5e114202004864f6 (diff)
downloadnautilus-9c496898bb1c0644a3a3d4ea14e36852b5f27077.tar.gz
Connect the compare function before root nodes are added. Prevents the
2005-11-08 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-tree-view.c: (create_tree): Connect the compare function before root nodes are added. Prevents the internal sort model of GtkTree from going out of sync with the tree view after a root node resort. Fixes #158506.
-rw-r--r--ChangeLog8
-rw-r--r--src/file-manager/fm-tree-view.c7
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 34720d1b1..5ffd12cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-08 Martin Wehner <martin.wehner@gmail.com>
+
+ * src/file-manager/fm-tree-view.c: (create_tree):
+ Connect the compare function before root nodes are added.
+ Prevents the internal sort model of GtkTree from going
+ out of sync with the tree view after a root node resort.
+ Fixes #158506.
+
2005-10-27 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 213854a70..acd0c6c1f 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -1236,6 +1236,10 @@ create_tree (FMTreeView *view)
view->details->tree_widget = GTK_TREE_VIEW
(gtk_tree_view_new_with_model (GTK_TREE_MODEL (view->details->sort_model)));
g_object_unref (view->details->sort_model);
+
+ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (view->details->sort_model),
+ compare_rows, view, NULL);
+
g_signal_connect_object
(view->details->child_model, "row_loaded",
G_CALLBACK (row_loaded_callback),
@@ -1263,9 +1267,6 @@ create_tree (FMTreeView *view)
g_object_unref (view->details->child_model);
- gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (view->details->sort_model),
- compare_rows, view, NULL);
-
gtk_tree_view_set_headers_visible (view->details->tree_widget, FALSE);
view->details->drag_dest =