It's amazing what reversing the order in an if statement will do. Doing so

2000-11-22    <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
	reversing the order in an if statement will do.  Doing so managed
	to make the treemodelsort half work.  Other half will follow after
	I get the insert function fully fixed.

ChangeLog

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-0

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-10

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-2

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-4

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-6

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

ChangeLog.pre-2-8

+2000-11-22    <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_calc_size): It's amazing what
+	reversing the order in an if statement will do.  Doing so managed
+	to make the treemodelsort half work.  Other half will follow after
+	I get the insert function fully fixed.
+
 2000-11-21  Elliot Lee  <sopwith@redhat.com>
 	* gtk/gtkmenushell.h: GdkEventButton->button can occupy significantly
 	more than 2 bits. Besides, I need to implement an evil hack. :)

gtk/gtktreeview.c

@@ -2318,8 +2318,8 @@ gtk_tree_view_calc_size (GtkTreeView *tree_view,
 	    column->size = MAX (column->size, width);
 	}
       _gtk_rbtree_node_set_height (tree, temp, max_height);
-      if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter) &&
-	  temp->children != NULL)
+      if (temp->children != NULL &&
+	  gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
 	gtk_tree_view_calc_size (tree_view, temp->children, &child, depth + 1);
       temp = _gtk_rbtree_next (tree, temp);
     }