summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorFelipe Borges <felipeborges@gnome.org>2015-11-23 11:30:38 +0100
committerCarlos Soriano <csoriano@gnome.org>2015-11-23 11:37:10 +0100
commit7621a5220b5e8fa6a0013af0bedfa3fd7ec05cd6 (patch)
treeece10af403bd70890cf42d319e2b18c7245231f7 /src/resources
parentff61b06f17cb00b6d09a7944e81f034a0b610aca (diff)
downloadnautilus-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
Diffstat (limited to 'src/resources')
-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.xml2
2 files changed, 1 insertions, 1 deletions
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>