[gtk+] Avoid double app menu fallback

[Matthias Clasen <matthiasc src gnome org>]

commit acdd9c8ed682319c12bb22f84d1703b744ac4147
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 13 01:00:13 2013 -0500

    Avoid double app menu fallback
    
    Both GtkApplicationWindow and GtkHeaderBar listen for changes
    of the gtk-shell-shows-app-menu setting, so they need to somehow
    coordinate who is going to take action and show a fallback.
    We prefer the menu button in the title over the menubar, so
    let GtkApplicationWindow opt out if it finds that the header bar
    has been configured to show window controls.

 gtk/gtkwindow.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1a8e691..66e2fd3 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3619,7 +3619,7 @@ _gtk_window_titlebar_shows_app_menu (GtkWindow *window)
   GtkWindowPrivate *priv = window->priv;
 
   if (GTK_IS_HEADER_BAR (priv->title_box))
-    return _gtk_header_bar_get_shows_app_menu (GTK_HEADER_BAR (priv->title_box));
+    return gtk_header_bar_get_show_close_button (GTK_HEADER_BAR (priv->title_box));
 
   return FALSE;
 }