[gtk+/gtk-3-8] Fix keyboard activation of menu buttons

[Matthias Clasen <matthiasc src gnome org>]

commit 876d5f0748392fa1f2ca6bd4a90ade78f77492f3
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 18 22:22:22 2013 -0400

    Fix keyboard activation of menu buttons
    
    Keyboard activation relies on the menu not being visible,
    so ensure that it isn't when the menu is attached.
    
    Problem tracked down by Vincent Le Garrec,
    https://bugzilla.gnome.org/show_bug.cgi?id=688738

 gtk/gtkmenubutton.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 95b2bc7..0d014ee 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -657,10 +657,7 @@ _gtk_menu_button_set_popup_with_func (GtkMenuButton                 *menu_button
     {
       if (gtk_widget_get_visible (GTK_WIDGET (priv->popup)))
         gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->popup));
-    }
 
-  if (priv->popup)
-    {
       g_signal_handlers_disconnect_by_func (priv->popup,
                                             menu_deactivate_cb,
                                             menu_button);
@@ -674,6 +671,7 @@ _gtk_menu_button_set_popup_with_func (GtkMenuButton                 *menu_button
       gtk_menu_attach_to_widget (GTK_MENU (priv->popup), GTK_WIDGET (menu_button),
                                  menu_detacher);
 
+      gtk_widget_set_visible (priv->popup, FALSE);
       gtk_widget_set_sensitive (GTK_WIDGET (menu_button), TRUE);
 
       g_signal_connect (priv->popup, "deactivate",