]> Pileus Git - ~andy/gtk/commitdiff
frame: don't access padding before it's initialized
authorCosimo Cecchi <cosimoc@gnome.org>
Wed, 23 Nov 2011 16:21:29 +0000 (11:21 -0500)
committerCosimo Cecchi <cosimoc@gnome.org>
Wed, 23 Nov 2011 16:21:29 +0000 (11:21 -0500)
Move padding initialization before its first access.

gtk/gtkframe.c

index 275c6ea4ca9eed6be96e0605dec847eed1d35f6c..c2e1ad2f1784210ebdcdea228d4059421b776479 100644 (file)
@@ -860,6 +860,9 @@ gtk_frame_get_preferred_size (GtkWidget      *request,
   gint minimum, natural;
   guint border_width;
 
+  get_padding_and_border (frame, &padding);
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+
   if (priv->label_widget && gtk_widget_get_visible (priv->label_widget))
     {
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -902,9 +905,6 @@ gtk_frame_get_preferred_size (GtkWidget      *request,
         }
     }
 
-  get_padding_and_border (frame, &padding);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
       minimum += (border_width * 2) + padding.left + padding.right;