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.

diff --git a/ChangeLog b/ChangeLog
index 80b796edec4982c2417c6ecb01e190aa70324f6d..fdf3bcaf0562cb7a71c21c5004b3d6107a065589 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 80b796edec4982c2417c6ecb01e190aa70324f6d..fdf3bcaf0562cb7a71c21c5004b3d6107a065589 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,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.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 80b796edec4982c2417c6ecb01e190aa70324f6d..fdf3bcaf0562cb7a71c21c5004b3d6107a065589 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,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.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 80b796edec4982c2417c6ecb01e190aa70324f6d..fdf3bcaf0562cb7a71c21c5004b3d6107a065589 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 80b796edec4982c2417c6ecb01e190aa70324f6d..fdf3bcaf0562cb7a71c21c5004b3d6107a065589 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,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.

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 9fdfc74f3438619b8ece0f27a580249edf1eb0a1..a35b237219ee4508d93ef8941f2c21f6f0e0394c 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/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,