diff --git a/ChangeLog b/ChangeLog index 1aa2868a80..b13470468e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1aa2868a80..b13470468e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1aa2868a80..b13470468e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1aa2868a80..b13470468e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1aa2868a80..b13470468e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1aa2868a80..b13470468e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Nov 3 01:27:40 2002 Kristian Rietveld + + * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): + check if width isn't zero instead of calc_width ... + Sun Nov 3 01:22:01 2002 Kristian Rietveld Merge fest from HEAD, note that only a selection of bug fixes on diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index b7f4131ac9..9eac4cdd75 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -266,7 +266,7 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer *cell, } } - if (calc_width) + if (width) *width = calc_width; if (height)