[gnome-terminal] prefs: Hide default-menubar setting when headerbars are used

[Christian Persch <chpe src gnome org>]

commit f4340fc87b2e661425b10d4c46b8236f357a5bd0
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Feb 26 21:42:31 2019 +0100

    prefs: Hide default-menubar setting when headerbars are used
    
    As headerbars combine the functionality of titlebar, toolbar and
    menubar, they generally replace (not supplement) those elements.
    
    For that reasons, the default-show-menubar setting is ignored when
    headerbars are enabled. However despite not having any effect, the
    corresponding checkbox is still shown in the preferences. It doesn't
    make sense to expose non-working settings, so hide it when headerbars
    are used.
    
    https://gitlab.gnome.org/GNOME/gnome-terminal/issues/81

 src/terminal-prefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 53715232..5e9b3293 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -831,7 +831,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   g_object_get (gtk_settings_get_default (),
                 "gtk-shell-shows-menubar", &shell_shows_menubar,
                 NULL);
-  if (shell_shows_menubar) {
+  if (shell_shows_menubar || terminal_app_get_use_headerbar (app)) {
     gtk_widget_set_visible (show_menubar_button, FALSE);
   } else {
     g_settings_bind (settings,