Fix a C99ism

5c62a90e · Matthias Clasen · b8b1e8ec · 5c62a90e · 5c62a90e · 5c62a90e
Commit 5c62a90e authored Jan 12, 2006 by Matthias Clasen
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

ChangeLog ChangeLog +4 -0

ChangeLog.pre-2-10 ChangeLog.pre-2-10 +4 -0

gtk/gtklabel.c gtk/gtklabel.c +2 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+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>

 	* gtk/gtklabel.c: Add some notify batching, always

--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
+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>

 	* gtk/gtklabel.c: Add some notify batching, always

--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1794,11 +1794,12 @@ get_label_wrap_width (GtkLabel *label)
  PangoLayout *layout;
  GtkStyle *style = GTK_WIDGET (label)->style;
  static GQuark quark_label_wrap_width = 0;
+  LabelWrapWidth *wrap_width;

  if (quark_label_wrap_width == 0)
    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)
    {
      wrap_width = g_slice_new0 (LabelWrapWidth);