diff --git a/ChangeLog b/ChangeLog
index 27efefbfb2..636415ab5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Mon Jun  9 21:01:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 27efefbfb2..636415ab5e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Mon Jun  9 21:01:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 27efefbfb2..636415ab5e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Mon Jun  9 21:01:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 27efefbfb2..636415ab5e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Mon Jun  9 21:01:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 27efefbfb2..636415ab5e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
+	check if width is !null, not *width. Doh.
+
 Mon Jun  9 21:01:16 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index aab52702f2..ab2c6cee64 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2361,7 +2361,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,