summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <maclas@gmx.de>2004-06-26 02:57:32 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-06-26 02:57:32 +0000
commitc3bb3bef04bef5fe6b8f6c663f9fa2428bfa83fe (patch)
tree92611297e3df90135bd5fca33342e388bdb10a69
parent8b6934bc2c6140df9094a582a4e5cbeb4f889d20 (diff)
downloadgtk+-c3bb3bef04bef5fe6b8f6c663f9fa2428bfa83fe.tar.gz
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)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtktreestore.c15
5 files changed, 30 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cdce4401b..434a5de42f 100644
--- 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 3cdce4401b..434a5de42f 100644
--- 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 3cdce4401b..434a5de42f 100644
--- 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 3cdce4401b..434a5de42f 100644
--- 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 8d18427394..a66d53917e 100644
--- 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)