diff options
| author | Felipe Borges <felipeborges@gnome.org> | 2015-11-23 11:30:38 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-11-23 11:37:10 +0100 |
| commit | 7621a5220b5e8fa6a0013af0bedfa3fd7ec05cd6 (patch) | |
| tree | ece10af403bd70890cf42d319e2b18c7245231f7 | |
| parent | ff61b06f17cb00b6d09a7944e81f034a0b610aca (diff) | |
| download | nautilus-7621a5220b5e8fa6a0013af0bedfa3fd7ec05cd6.tar.gz | |
application: let GtkApplication load the appmenu
Since bgo#757826 introduced g_application_set_resource_base_path,
we don't need to use a GtkBuilder to load the appmenu.
GtkApplication automatically loads menus from the GtkBuilder resource
located at "gtk/menus.ui", relative to the application's resource
base path (see g_application_set_resource_base_path ()). The menu
with the ID "app-menu" is taken as the application's app menu.
https://bugzilla.gnome.org/show_bug.cgi?id=757946
| -rw-r--r-- | src/nautilus-application-actions.c | 13 | ||||
| -rw-r--r-- | src/resources/gtk/menus.ui (renamed from src/resources/ui/nautilus-app-menu.ui) | 0 | ||||
| -rw-r--r-- | src/resources/nautilus.gresource.xml | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/nautilus-application-actions.c b/src/nautilus-application-actions.c index b5c513405..12fb6ecf1 100644 --- a/src/nautilus-application-actions.c +++ b/src/nautilus-application-actions.c @@ -219,19 +219,6 @@ nautilus_init_application_actions (NautilusApplication *app) app_entries, G_N_ELEMENTS (app_entries), app); - builder = gtk_builder_new (); - gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/ui/nautilus-app-menu.ui", &error); - - if (error == NULL) { - gtk_application_set_app_menu (GTK_APPLICATION (app), - G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); - } else { - g_critical ("Unable to add the application menu: %s\n", error->message); - g_error_free (error); - } - - g_object_unref (builder); - debug_no_app_menu = g_getenv ("NAUTILUS_DEBUG_NO_APP_MENU"); if (debug_no_app_menu) { DEBUG ("Disabling app menu GtkSetting as requested..."); diff --git a/src/resources/ui/nautilus-app-menu.ui b/src/resources/gtk/menus.ui index 5385406ac..5385406ac 100644 --- a/src/resources/ui/nautilus-app-menu.ui +++ b/src/resources/gtk/menus.ui diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml index 92193f729..d6bfd8b8d 100644 --- a/src/resources/nautilus.gresource.xml +++ b/src/resources/nautilus.gresource.xml @@ -3,7 +3,7 @@ <gresource prefix="/org/gnome/nautilus"> <file compressed="true">ui/nautilus-bookmarks-window.ui</file> <file compressed="true">ui/nautilus-file-management-properties.ui</file> - <file>ui/nautilus-app-menu.ui</file> + <file>gtk/menus.ui</file> <file>ui/nautilus-pathbar-context-menu.ui</file> <file>ui/nautilus-toolbar.ui</file> <file>ui/nautilus-toolbar-view-menu.ui</file> |