diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 34 | ||||
| -rw-r--r-- | src/nautilus-bookmarks-window.c | 6 | ||||
| -rw-r--r-- | src/nautilus-desktop-icon-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-file-management-properties.c | 6 | ||||
| -rw-r--r-- | src/nautilus-icon-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-list-view.c | 5 | ||||
| -rw-r--r-- | src/nautilus-toolbar.c | 4 | ||||
| -rw-r--r-- | src/nautilus-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 4 | ||||
| -rw-r--r-- | src/nautilus.gresource.xml | 15 |
10 files changed, 49 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 451f892d6..ce06583b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,8 +53,28 @@ $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-dbus-interfac $(top_srcdir)/data/freedesktop-dbus-interfaces.xml \ $(NULL) +UI_FILES = \ + nautilus-bookmarks-window.ui \ + nautilus-file-management-properties.ui \ + nautilus-icon-view-ui.xml \ + nautilus-toolbar-ui.xml \ + nautilus-directory-view-ui.xml \ + nautilus-desktop-icon-view-ui.xml \ + nautilus-list-view-ui.xml \ + nautilus-shell-ui.xml \ + $(NULL) + +nautilus-resources.c: nautilus.gresource.xml $(UI_FILES) + glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name nautilus $(srcdir)/nautilus.gresource.xml + +nautilus-resources.h: nautilus.gresource.xml + glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name nautilus $(srcdir)/nautilus.gresource.xml + + BUILT_SOURCES = \ $(dbus_built_sources) \ + nautilus-resources.c \ + nautilus-resources.h \ $(NULL) nautilus_SOURCES = \ @@ -193,18 +213,6 @@ TESTS=check-nautilus @INTLTOOL_SERVER_RULE@ -uidir = $(datadir)/nautilus/ui -ui_DATA = \ - nautilus-shell-ui.xml \ - nautilus-file-management-properties.ui \ - nautilus-bookmarks-window.ui \ - nautilus-desktop-icon-view-ui.xml \ - nautilus-directory-view-ui.xml \ - nautilus-icon-view-ui.xml \ - nautilus-list-view-ui.xml \ - nautilus-toolbar-ui.xml \ - $(NULL) - CLEANFILES = \ $(BUILT_SOURCES) \ $(server_DATA) \ @@ -212,7 +220,7 @@ CLEANFILES = \ EXTRA_DIST = \ $(server_in_files) \ - $(ui_DATA) \ + $(UI_FILES) \ check-nautilus \ $(NULL) diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c index 351ed9951..872a46f26 100644 --- a/src/nautilus-bookmarks-window.c +++ b/src/nautilus-bookmarks-window.c @@ -254,9 +254,9 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc bookmarks = list; builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, - UIDIR "/nautilus-bookmarks-window.ui", - NULL)) { + if (!gtk_builder_add_from_resource (builder, + "/org/gnome/nautilus/nautilus-bookmarks-window.ui", + NULL)) { return NULL; } diff --git a/src/nautilus-desktop-icon-view.c b/src/nautilus-desktop-icon-view.c index 7a8661b61..7f090953b 100644 --- a/src/nautilus-desktop-icon-view.c +++ b/src/nautilus-desktop-icon-view.c @@ -747,7 +747,6 @@ real_merge_menus (NautilusView *view) NautilusDesktopIconView *desktop_view; GtkUIManager *ui_manager; GtkActionGroup *action_group; - const char *ui; NAUTILUS_VIEW_CLASS (nautilus_desktop_icon_view_parent_class)->merge_menus (view); @@ -765,9 +764,8 @@ real_merge_menus (NautilusView *view) gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); g_object_unref (action_group); /* owned by ui manager */ - ui = nautilus_ui_string_get ("nautilus-desktop-icon-view-ui.xml"); desktop_view->details->desktop_merge_id = - gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-desktop-icon-view-ui.xml", NULL); } static NautilusView * diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c index 5127f9eab..20c3df4c5 100644 --- a/src/nautilus-file-management-properties.c +++ b/src/nautilus-file-management-properties.c @@ -837,9 +837,9 @@ nautilus_file_management_properties_dialog_show (GtkWindow *window) builder = gtk_builder_new (); - gtk_builder_add_from_file (builder, - UIDIR "/nautilus-file-management-properties.ui", - NULL); + gtk_builder_add_from_resource (builder, + "/org/gnome/nautilus/nautilus-file-management-properties.ui", + NULL); nautilus_file_management_properties_dialog_setup (builder, window); diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c index 0eaf243ab..8db10f29b 100644 --- a/src/nautilus-icon-view.c +++ b/src/nautilus-icon-view.c @@ -1356,7 +1356,6 @@ nautilus_icon_view_merge_menus (NautilusView *view) GtkUIManager *ui_manager; GtkActionGroup *action_group; GtkAction *action; - const char *ui; g_assert (NAUTILUS_IS_ICON_VIEW (view)); @@ -1385,9 +1384,8 @@ nautilus_icon_view_merge_menus (NautilusView *view) gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); g_object_unref (action_group); /* owned by ui manager */ - ui = nautilus_ui_string_get ("nautilus-icon-view-ui.xml"); icon_view->details->icon_merge_id = - gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-icon-view-ui.xml", NULL); /* Do one-time state-setting here; context-dependent state-setting * is done in update_menus. diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 2747ea96e..09b252ac2 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -2659,7 +2659,6 @@ nautilus_list_view_merge_menus (NautilusView *view) NautilusListView *list_view; GtkUIManager *ui_manager; GtkActionGroup *action_group; - const char *ui; list_view = NAUTILUS_LIST_VIEW (view); @@ -2677,8 +2676,8 @@ nautilus_list_view_merge_menus (NautilusView *view) gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); g_object_unref (action_group); /* owned by ui manager */ - ui = nautilus_ui_string_get ("nautilus-list-view-ui.xml"); - list_view->details->list_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + list_view->details->list_merge_id = + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-list-view-ui.xml", NULL); list_view->details->menus_ready = TRUE; } diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index 305dbf683..d770f44e3 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -88,7 +88,6 @@ nautilus_toolbar_constructed (GObject *obj) GtkToolItem *item; GtkWidget *hbox, *toolbar, *search; GtkStyleContext *context; - const gchar *ui; G_OBJECT_CLASS (nautilus_toolbar_parent_class)->constructed (obj); @@ -96,9 +95,8 @@ nautilus_toolbar_constructed (GObject *obj) GTK_JUNCTION_BOTTOM); /* add the UI */ - ui = nautilus_ui_string_get ("nautilus-toolbar-ui.xml"); self->priv->ui_manager = gtk_ui_manager_new (); - gtk_ui_manager_add_ui_from_string (self->priv->ui_manager, ui, -1, NULL); + gtk_ui_manager_add_ui_from_resource (self->priv->ui_manager, "/org/gnome/nautilus/nautilus-toolbar-ui.xml", NULL); gtk_ui_manager_insert_action_group (self->priv->ui_manager, self->priv->action_group, 0); toolbar = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar"); diff --git a/src/nautilus-view.c b/src/nautilus-view.c index b61708070..fd8bb0c85 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -7162,7 +7162,6 @@ real_merge_menus (NautilusView *view) GtkActionGroup *action_group; GtkUIManager *ui_manager; GtkAction *action; - const char *ui; char *tooltip; ui_manager = nautilus_window_get_ui_manager (view->details->window); @@ -7196,8 +7195,7 @@ real_merge_menus (NautilusView *view) gtk_ui_manager_insert_action_group (ui_manager, action_group, -1); g_object_unref (action_group); /* owned by ui manager */ - ui = nautilus_ui_string_get ("nautilus-directory-view-ui.xml"); - view->details->dir_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + view->details->dir_merge_id = gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-directory-view-ui.xml", NULL); view->details->scripts_invalid = TRUE; view->details->templates_invalid = TRUE; diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 6178c178f..4dc4a2296 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -1223,7 +1223,6 @@ nautilus_window_initialize_menus (NautilusWindow *window) GtkActionGroup *action_group; GtkUIManager *ui_manager; GtkAction *action; - const char *ui; gint i; window->details->ui_manager = gtk_ui_manager_new (); @@ -1296,8 +1295,7 @@ nautilus_window_initialize_menus (NautilusWindow *window) G_CALLBACK (disconnect_proxy_cb), window); /* add the UI */ - ui = nautilus_ui_string_get ("nautilus-shell-ui.xml"); - gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-shell-ui.xml", NULL); nautilus_window_initialize_trash_icon_monitor (window); nautilus_window_initialize_go_menu (window); diff --git a/src/nautilus.gresource.xml b/src/nautilus.gresource.xml new file mode 100644 index 000000000..8765788cb --- /dev/null +++ b/src/nautilus.gresource.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/gnome/nautilus"> + <file compressed="true">nautilus-bookmarks-window.ui</file> + <file compressed="true">nautilus-file-management-properties.ui</file> + <file>nautilus-icon-view-ui.xml</file> + <file>nautilus-toolbar-ui.xml</file> + <file>nautilus-directory-view-ui.xml</file> + <file>nautilus-desktop-icon-view-ui.xml</file> + <file>nautilus-list-view-ui.xml</file> + <file>nautilus-shell-ui.xml</file> + <file alias="icons/thumbnail_frame.png">../icons/thumbnail_frame.png</file> + <file alias="icons/knob.png">../icons/knob.png</file> + </gresource> +</gresources> |