Avoid uninitialized use of &parent_iter. (#145007, John Finlay)

Fri Jun 25 22:49:58 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreestore.c (gtk_tree_store_move): Avoid uninitialized
	use of &parent_iter. (#145007, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 3cdce4401b7b5c08c63cc4ca7985d418fedf42f5..434a5de42fe074c5ca3832678ddc5f67f1ba4ba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 25 22:49:58 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Avoid uninitialized
+       use of &parent_iter. (#145007, John Finlay)
+
 2004-06-25  Bastien Nocera  <hadess@hadess.net>
 
        reviewed by: Matthias Clasen  <maclas@gmx.de>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cdce4401b7b5c08c63cc4ca7985d418fedf42f5..434a5de42fe074c5ca3832678ddc5f67f1ba4ba3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jun 25 22:49:58 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Avoid uninitialized
+       use of &parent_iter. (#145007, John Finlay)
+
 2004-06-25  Bastien Nocera  <hadess@hadess.net>
 
        reviewed by: Matthias Clasen  <maclas@gmx.de>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3cdce4401b7b5c08c63cc4ca7985d418fedf42f5..434a5de42fe074c5ca3832678ddc5f67f1ba4ba3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jun 25 22:49:58 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Avoid uninitialized
+       use of &parent_iter. (#145007, John Finlay)
+
 2004-06-25  Bastien Nocera  <hadess@hadess.net>
 
        reviewed by: Matthias Clasen  <maclas@gmx.de>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cdce4401b7b5c08c63cc4ca7985d418fedf42f5..434a5de42fe074c5ca3832678ddc5f67f1ba4ba3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jun 25 22:49:58 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Avoid uninitialized
+       use of &parent_iter. (#145007, John Finlay)
+
 2004-06-25  Bastien Nocera  <hadess@hadess.net>
 
        reviewed by: Matthias Clasen  <maclas@gmx.de>

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 8d18427394bdb58cd76e31b5b504c708d3243e9c..a66d53917e12f8da3f2de43e3de02f9d55f7aff2 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -2408,12 +2408,17 @@ gtk_tree_store_move (GtkTreeStore *tree_store,
     }
 
   if (depth)
-    path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), &parent_iter);
+    {
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), &parent_iter);
+      gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+                                    path, &parent_iter, order);
+    }
   else
-    path = gtk_tree_path_new ();
-
-  gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
-                                path, &parent_iter, order);
+    {
+      path = gtk_tree_path_new ();
+      gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+                                    path, NULL, order);
+    }
 
   gtk_tree_path_free (path);
   if (position)