Fix an oversight in mnemonic handling

In some situations, GtkButton would ignore the use-underline
property. This was reported in bug 586330.

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index d749344a0527245961a20e0910cd65eb6a45289b..43ec81853b3838c993203a7dc7424fb28f5ed0d5 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -997,9 +997,14 @@ gtk_button_construct_child (GtkButton *button)
 
       if (label_text)
        {
-         label = gtk_label_new_with_mnemonic (label_text);
-         gtk_label_set_mnemonic_widget (GTK_LABEL (label), 
-                                        GTK_WIDGET (button));
+          if (button->use_underline)
+            {
+             label = gtk_label_new_with_mnemonic (label_text);
+             gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+                                             GTK_WIDGET (button));
+            }
+          else
+            label = gtk_label_new (label_text);
 
          if (priv->image_position == GTK_POS_RIGHT ||
              priv->image_position == GTK_POS_BOTTOM)