Don't crash if somebody tries to move a node after itself in a list of

Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if
	somebody tries to move a node after itself in a list of
	length 1.  (#145291, Sampo Nurmentaus)

diff --git a/ChangeLog b/ChangeLog
index 901dbaba4808b3d8ea66fe8890f3858bd12db37b..d88bba107418ded1059b5f9d778aad75d68c2ae8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if
+       somebody tries to move a node after itself in a list of 
+       length 1.  (#145291, Sampo Nurmentaus)
+
 Sat Jul  3 23:43:23 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/faq/gtk-faq.sgml: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 901dbaba4808b3d8ea66fe8890f3858bd12db37b..d88bba107418ded1059b5f9d778aad75d68c2ae8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if
+       somebody tries to move a node after itself in a list of 
+       length 1.  (#145291, Sampo Nurmentaus)
+
 Sat Jul  3 23:43:23 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/faq/gtk-faq.sgml: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 901dbaba4808b3d8ea66fe8890f3858bd12db37b..d88bba107418ded1059b5f9d778aad75d68c2ae8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if
+       somebody tries to move a node after itself in a list of 
+       length 1.  (#145291, Sampo Nurmentaus)
+
 Sat Jul  3 23:43:23 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/faq/gtk-faq.sgml: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 901dbaba4808b3d8ea66fe8890f3858bd12db37b..d88bba107418ded1059b5f9d778aad75d68c2ae8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if
+       somebody tries to move a node after itself in a list of 
+       length 1.  (#145291, Sampo Nurmentaus)
+
 Sat Jul  3 23:43:23 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/faq/gtk-faq.sgml: 

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index a66d53917e12f8da3f2de43e3de02f9d55f7aff2..d59c97b58a64da5ed7555d7285338798e0ed260d 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -2317,7 +2317,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store,
       parent->children = node;
 
       node->next = tmp;
-      tmp->prev = node;
+      if (tmp) 
+       tmp->prev = node;
 
       handle_b = FALSE;
     }