diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtktreeviewcolumn.c | 2 |
6 files changed, 36 insertions, 1 deletions
@@ -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 80b796ede..fdf3bcaf0 100644 --- 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 80b796ede..fdf3bcaf0 100644 --- 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 80b796ede..fdf3bcaf0 100644 --- 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 80b796ede..fdf3bcaf0 100644 --- 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 9fdfc74f3..a35b23721 100644 --- 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, |