Fix a C99ism

This commit is contained in:
Matthias Clasen 2006-01-12 04:33:33 +00:00
parent b8b1e8eca4
commit 5c62a90e38
3 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2006-01-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)
2006-01-11 Matthias Clasen <mclasen@redhat.com> 2006-01-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: Add some notify batching, always * gtk/gtklabel.c: Add some notify batching, always

View File

@ -1,3 +1,7 @@
2006-01-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: Fix a C99ism (#326658, Kazuki Iwamoto)
2006-01-11 Matthias Clasen <mclasen@redhat.com> 2006-01-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: Add some notify batching, always * gtk/gtklabel.c: Add some notify batching, always

View File

@ -1794,11 +1794,12 @@ get_label_wrap_width (GtkLabel *label)
PangoLayout *layout; PangoLayout *layout;
GtkStyle *style = GTK_WIDGET (label)->style; GtkStyle *style = GTK_WIDGET (label)->style;
static GQuark quark_label_wrap_width = 0; static GQuark quark_label_wrap_width = 0;
LabelWrapWidth *wrap_width;
if (quark_label_wrap_width == 0) if (quark_label_wrap_width == 0)
quark_label_wrap_width = g_quark_from_static_string ("gtk-label-wrap-width"); quark_label_wrap_width = g_quark_from_static_string ("gtk-label-wrap-width");
LabelWrapWidth *wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width); wrap_width = g_object_get_qdata (G_OBJECT (style), quark_label_wrap_width);
if (!wrap_width) if (!wrap_width)
{ {
wrap_width = g_slice_new0 (LabelWrapWidth); wrap_width = g_slice_new0 (LabelWrapWidth);