[file-roller] only show the menubar when the shell shows the menubar

[Paolo Bacchilega <paobac src gnome org>]

commit 74afd37cd229fd4f00c862a040805bb5dcd087ef
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Dec 20 19:13:00 2015 +0100

    only show the menubar when the shell shows the menubar
    
    [bug #730291]

 src/fr-application.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/fr-application.c b/src/fr-application.c
index f3eb069..ad00f2d 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -447,21 +447,21 @@ static void
 fr_application_startup (GApplication *application)
 {
        GtkSettings     *gtk_settings;
-       gboolean         show_app_menu;
-       gboolean         show_menubar;
+       gboolean         shell_shows_menubar;
 
        G_APPLICATION_CLASS (fr_application_parent_class)->startup (application);
 
        fr_application_register_archive_manager_service (FR_APPLICATION (application));
        initialize_data ();
 
+       /* use the menubar only when the shell shows the menu bar */
+
        gtk_settings = gtk_settings_get_default ();
        g_object_get (G_OBJECT (gtk_settings),
-                     "gtk-shell-shows-app-menu", &show_app_menu,
-                     "gtk-shell-shows-menubar", &show_menubar,
+                     "gtk-shell-shows-menubar", &shell_shows_menubar,
                      NULL);
 
-       if (!show_app_menu || show_menubar)
+       if (shell_shows_menubar)
                initialize_app_menubar (application);
        else
                initialize_app_menu (application);