[evince] shell: Always install the app menu



commit 6652414e6e3688184ae89591f73646034c53e2ce
Author: Christian Persch <chpe gnome org>
Date:   Sat Feb 16 22:38:21 2013 +0100

    shell: Always install the app menu
    
    Always install the app menu, and just disable showing the fallback menu
    inside the window.

 shell/ev-application.c |    6 ------
 shell/ev-window.c      |    1 +
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 7254cda..d478eb6 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -1019,15 +1019,9 @@ ev_application_startup (GApplication *gapplication)
         EvApplication *application = EV_APPLICATION (gapplication);
         GtkBuilder *builder;
         GError *error = NULL;
-        gboolean shell_shows_app_menu;
 
         G_APPLICATION_CLASS (ev_application_parent_class)->startup (gapplication);
 
-        /* We only want to add an application menu when it's actually used! */
-        g_object_get (gtk_settings_get_for_screen (gdk_screen_get_default ()), "gtk-shell-shows-app-menu", 
&shell_shows_app_menu, NULL);
-        if (!shell_shows_app_menu)
-          return;
-
         g_action_map_add_action_entries (G_ACTION_MAP (application),
                                          app_menu_actions, G_N_ELEMENTS (app_menu_actions),
                                          application);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 97f4a90..d58dfeb 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -7487,6 +7487,7 @@ ev_window_new (void)
        ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
                                              "type", GTK_WINDOW_TOPLEVEL,
                                               "application", g_application_get_default (),
+                                             "show-menubar", FALSE,
                                              NULL));
 
        return ev_window;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]