[gtk+/quartz-integration: 87/108] accellabel: Only daw accelerator after natural size has been reached

[John Ralls <jralls src gnome org>]

commit d4344a6941a5b334ad4085a496689a738dd064d0
Author: Benjamin Otte <otte redhat com>
Date:   Sun May 1 08:00:50 2011 +0200

    accellabel: Only daw accelerator after natural size has been reached

 gtk/gtkaccellabel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 167e603..07e8820 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -386,9 +386,9 @@ gtk_accel_label_draw (GtkWidget *widget,
   direction = gtk_widget_get_direction (widget);
   ac_width = gtk_accel_label_get_accel_width (accel_label);
   gtk_widget_get_allocation (widget, &allocation);
-  gtk_widget_get_preferred_size (widget, &requisition, NULL);
+  gtk_widget_get_preferred_size (widget, NULL, &requisition);
 
-  if (allocation.width >= requisition.width + ac_width)
+  if (allocation.width >= requisition.width + ac_width && FALSE)
     {
       GtkStyleContext *context;
       PangoLayout *label_layout;