From dcc2896f6d4644755a2dbb23695cd4305c823795 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 4 Jan 2007 16:24:29 +0000 Subject: [PATCH] Fix uninitialized width variable. 2007-01-04 Behdad Esfahbod * gtk/gtklabel.c (get_layout_location): Fix uninitialized width variable. svn path=/trunk/; revision=17069 --- ChangeLog | 5 +++++ gtk/gtklabel.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f81d6a806..a617e1476a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-04 Behdad Esfahbod + + * gtk/gtklabel.c (get_layout_location): Fix uninitialized width + variable. + 2007-01-04 Matthias Clasen * gtk/Makefile.am: diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index d58754e7f7..219f01e898 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2298,11 +2298,11 @@ get_layout_location (GtkLabel *label, int width; PangoRectangle logical; + width = pango_layout_get_width (label->layout); pango_layout_get_pixel_extents (label->layout, NULL, &logical); - req_width = logical.width; - if (width != -1) - req_width = MIN(PANGO_PIXELS (width), req_width); + /* width may be -1 */ + req_width = MIN(PANGO_PIXELS (width), logical.width); req_width += 2 * misc->xpad; } else