Pass a root path to gtk_tree_model_rows_reordered(). (#161720, Marcin

2004-12-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a
	root path to gtk_tree_model_rows_reordered().  (#161720,
	Marcin Krzyzanowski)

diff --git a/ChangeLog b/ChangeLog
index 6b13ff30b141fa015466ad344d65ed9a8ac9c5fa..f81b60be197198a2aa8dc4f6dbe8b12425cb9ae8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a
+       root path to gtk_tree_model_rows_reordered().  (#161720,
+       Marcin Krzyzanowski)
+
        * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't 
        translate NULL messages.  (#161789, Morten Welinder)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6b13ff30b141fa015466ad344d65ed9a8ac9c5fa..f81b60be197198a2aa8dc4f6dbe8b12425cb9ae8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-12-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a
+       root path to gtk_tree_model_rows_reordered().  (#161720,
+       Marcin Krzyzanowski)
+
        * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't 
        translate NULL messages.  (#161789, Morten Welinder)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6b13ff30b141fa015466ad344d65ed9a8ac9c5fa..f81b60be197198a2aa8dc4f6dbe8b12425cb9ae8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-12-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a
+       root path to gtk_tree_model_rows_reordered().  (#161720,
+       Marcin Krzyzanowski)
+
        * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't 
        translate NULL messages.  (#161789, Morten Welinder)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6b13ff30b141fa015466ad344d65ed9a8ac9c5fa..f81b60be197198a2aa8dc4f6dbe8b12425cb9ae8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-12-20  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a
+       root path to gtk_tree_model_rows_reordered().  (#161720,
+       Marcin Krzyzanowski)
+
        * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't 
        translate NULL messages.  (#161789, Morten Welinder)
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 29ed16ea924a57e9246132ef2220fdef1971b283..8ef1489a1a49c4eb4a74c86a370b92697c03485f 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1716,10 +1716,11 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
                                  gint          column)
 
 {
-  GtkTreePath *tmp_path;
+  GtkTreePath *path;
 
-  tmp_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
-  gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), tmp_path, iter);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
+  gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
+  gtk_tree_path_free (path);
 
   if (!iter_is_sorted (list_store, iter))
     {
@@ -1731,12 +1732,12 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
                                   gtk_list_store_compare_func,
                                   list_store);
       order = generate_order (list_store->seq, old_positions);
+      path = gtk_tree_path_new ();
       gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
-                                     tmp_path, NULL, order);
+                                     path, NULL, order);
+      gtk_tree_path_free (path);
       g_free (order);
     }
-
-  gtk_tree_path_free (tmp_path);
 }
 
 static gboolean