Merged from stable.

Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
	check if width is !null, not *width. Doh.

ChangeLog

+Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from stable.

ChangeLog.pre-2-10

+Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from stable.

ChangeLog.pre-2-4

+Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from stable.

ChangeLog.pre-2-6

+Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from stable.

ChangeLog.pre-2-8

+Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>
 
 	Merged from stable.

gtk/gtktreeviewcolumn.c

@@ -2431,7 +2431,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
       if (visible == FALSE)
 	continue;
 
-      if (first_cell == FALSE && *width)
+      if (first_cell == FALSE && width)
 	*width += tree_column->spacing;
 
       gtk_cell_renderer_get_size (info->cell,