From 955d62e18765199d49a7a1e05eb878f92e3d9d37 Mon Sep 17 00:00:00 2001 From: dalcde Date: Fri, 31 Aug 2012 20:18:54 +0800 Subject: [PATCH] Renamed org.gnome.nemo to org.nemo --- data/Makefile.am | 4 +- data/Makefile.in | 4 +- data/dbus-interfaces.xml | 2 +- ...me.Nemo.service.in => org.Nemo.service.in} | 2 +- debian/nemo-data.install | 2 +- debian/nemo.gsettings-override | 2 +- libnemo-private/Makefile.am | 4 +- libnemo-private/Makefile.in | 4 +- libnemo-private/nemo-dbus-manager.c | 6 +- libnemo-private/nemo-file-operations.c | 6 +- libnemo-private/nemo-global-preferences.c | 14 ++-- libnemo-private/nemo-icon-canvas-item.c | 2 +- libnemo-private/nemo-thumbnails.c | 2 +- libnemo-private/nemo.convert | 14 ++-- ...gschema.xml.in => org.nemo.gschema.xml.in} | 74 +++++++++---------- src/nemo-application.c | 2 +- src/nemo-bookmarks-window.c | 2 +- src/nemo-desktop-icon-view.c | 2 +- src/nemo-file-management-properties.c | 2 +- src/nemo-icon-view.c | 2 +- src/nemo-list-view.c | 2 +- src/nemo-previewer.c | 6 +- src/nemo-toolbar.c | 2 +- src/nemo-view.c | 2 +- src/nemo-window-menus.c | 2 +- src/nemo.gresource.xml | 2 +- 26 files changed, 83 insertions(+), 85 deletions(-) rename data/{org.gnome.Nemo.service.in => org.Nemo.service.in} (72%) rename libnemo-private/{org.gnome.nemo.gschema.xml.in => org.nemo.gschema.xml.in} (89%) diff --git a/data/Makefile.am b/data/Makefile.am index ffd03dc9d..ca9f0960a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,9 +23,9 @@ servicedir = $(datadir)/dbus-1/services service_DATA = $(service_in_files:.service.in=.service) service_in_files = \ org.freedesktop.NemoFileManager1.service.in \ - org.gnome.Nemo.service.in + org.Nemo.service.in -org.gnome.Nemo.service: org.gnome.Nemo.service.in Makefile +org.Nemo.service: org.Nemo.service.in Makefile $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@ org.freedesktop.NemoFileManager1.service: org.freedesktop.NemoFileManager1.service.in Makefile diff --git a/data/Makefile.in b/data/Makefile.in index b8e8d1679..f3096f133 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -335,7 +335,7 @@ servicedir = $(datadir)/dbus-1/services service_DATA = $(service_in_files:.service.in=.service) service_in_files = \ org.freedesktop.NemoFileManager1.service.in \ - org.gnome.Nemo.service.in + org.Nemo.service.in nemodatadir = $(datadir)/nemo nemodata_DATA = \ @@ -827,7 +827,7 @@ uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \ @INTLTOOL_DESKTOP_RULE@ -org.gnome.Nemo.service: org.gnome.Nemo.service.in Makefile +org.Nemo.service: org.Nemo.service.in Makefile $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@ org.freedesktop.NemoFileManager1.service: org.freedesktop.NemoFileManager1.service.in Makefile diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml index 348e22a38..c9c9af0f7 100644 --- a/data/dbus-interfaces.xml +++ b/data/dbus-interfaces.xml @@ -24,7 +24,7 @@ --> - + diff --git a/data/org.gnome.Nemo.service.in b/data/org.Nemo.service.in similarity index 72% rename from data/org.gnome.Nemo.service.in rename to data/org.Nemo.service.in index e68e2e7f5..728608070 100644 --- a/data/org.gnome.Nemo.service.in +++ b/data/org.Nemo.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.Nemo +Name=org.Nemo Exec=@bindir@/nemo --no-default-window \ No newline at end of file diff --git a/debian/nemo-data.install b/debian/nemo-data.install index 759963944..5231dacc3 100644 --- a/debian/nemo-data.install +++ b/debian/nemo-data.install @@ -3,6 +3,6 @@ usr/share/nemo usr/share/locale usr/share/mime/packages/nemo.xml usr/share/GConf -usr/share/glib-2.0/schemas/org.gnome.nemo.gschema.xml +usr/share/glib-2.0/schemas/org.nemo.gschema.xml debian/nemo.xpm /usr/share/pixmaps debian/source_nemo.py /usr/share/apport/package-hooks diff --git a/debian/nemo.gsettings-override b/debian/nemo.gsettings-override index e2b8174c3..5627e0618 100644 --- a/debian/nemo.gsettings-override +++ b/debian/nemo.gsettings-override @@ -1,4 +1,4 @@ -[org.gnome.nemo.desktop] +[org.nemo.desktop] home-icon-visible=false computer-icon-visible=false trash-icon-visible=false diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am index 2707efbf7..9511d026b 100644 --- a/libnemo-private/Makefile.am +++ b/libnemo-private/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = \ dbus_built_sources = nemo-generated.c nemo-generated.h $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml gdbus-codegen \ - --interface-prefix org.gnome.Nemo. \ + --interface-prefix org.Nemo. \ --c-namespace NemoDBus \ --c-generate-object-manager \ --generate-c-code nemo-generated \ @@ -202,7 +202,7 @@ nodist_libnemo_private_la_SOURCES =\ $(lib_LTLIBRARIES): $(dependency_static_libs) -gsettingsschema_in_files = org.gnome.nemo.gschema.xml.in +gsettingsschema_in_files = org.nemo.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) .PRECIOUS: $(gsettings_SCHEMAS) diff --git a/libnemo-private/Makefile.in b/libnemo-private/Makefile.in index 502716660..3b79444a3 100644 --- a/libnemo-private/Makefile.in +++ b/libnemo-private/Makefile.in @@ -616,7 +616,7 @@ nodist_libnemo_private_la_SOURCES = \ $(BUILT_SOURCES) \ $(NULL) -gsettingsschema_in_files = org.gnome.nemo.gschema.xml.in +gsettingsschema_in_files = org.nemo.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) convertdir = $(datadir)/GConf/gsettings convert_DATA = nemo.convert @@ -1010,7 +1010,7 @@ uninstall-am: uninstall-convertDATA $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml gdbus-codegen \ - --interface-prefix org.gnome.Nemo. \ + --interface-prefix org.Nemo. \ --c-namespace NemoDBus \ --c-generate-object-manager \ --generate-c-code nemo-generated \ diff --git a/libnemo-private/nemo-dbus-manager.c b/libnemo-private/nemo-dbus-manager.c index 99aae064c..aaa4713e3 100644 --- a/libnemo-private/nemo-dbus-manager.c +++ b/libnemo-private/nemo-dbus-manager.c @@ -187,7 +187,7 @@ bus_acquired_handler_cb (GDBusConnection *conn, self->connection = g_object_ref (conn); - self->object_manager = g_dbus_object_manager_server_new ("/org/gnome/Nemo"); + self->object_manager = g_dbus_object_manager_server_new ("/org/Nemo"); self->file_operations = nemo_dbus_file_operations_skeleton_new (); @@ -205,7 +205,7 @@ bus_acquired_handler_cb (GDBusConnection *conn, self); g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->file_operations), self->connection, - "/org/gnome/Nemo", NULL); + "/org/Nemo", NULL); g_dbus_object_manager_server_set_connection (self->object_manager, self->connection); @@ -263,7 +263,7 @@ nemo_dbus_manager_constructed (GObject *object) g_application_hold (self->application); self->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, - "org.gnome.Nemo", + "org.Nemo", G_BUS_NAME_OWNER_FLAGS_NONE, bus_acquired_handler_cb, on_name_acquired, diff --git a/libnemo-private/nemo-file-operations.c b/libnemo-private/nemo-file-operations.c index e9950c1cc..cab269109 100644 --- a/libnemo-private/nemo-file-operations.c +++ b/libnemo-private/nemo-file-operations.c @@ -1281,12 +1281,10 @@ job_aborted (CommonJob *job) static gboolean should_confirm_trash (void) { - GSettings *prefs; gboolean confirm_trash; - prefs = g_settings_new ("org.gnome.nemo.preferences"); - confirm_trash = g_settings_get_boolean (prefs, NEMO_PREFERENCES_CONFIRM_TRASH); - g_object_unref (prefs); + confirm_trash = g_settings_get_boolean (nemo_preferences, NEMO_PREFERENCES_CONFIRM_TRASH); + return confirm_trash; } diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c index 0f8fe2bb8..cb9357eb6 100644 --- a/libnemo-private/nemo-global-preferences.c +++ b/libnemo-private/nemo-global-preferences.c @@ -68,13 +68,13 @@ nemo_global_preferences_init (void) initialized = TRUE; - nemo_preferences = g_settings_new("org.gnome.nemo.preferences"); - nemo_window_state = g_settings_new("org.gnome.nemo.window-state"); - nemo_icon_view_preferences = g_settings_new("org.gnome.nemo.icon-view"); - nemo_list_view_preferences = g_settings_new("org.gnome.nemo.list-view"); - nemo_compact_view_preferences = g_settings_new("org.gnome.nemo.compact-view"); - nemo_desktop_preferences = g_settings_new("org.gnome.nemo.desktop"); - nemo_tree_sidebar_preferences = g_settings_new("org.gnome.nemo.sidebar-panels.tree"); + nemo_preferences = g_settings_new("org.nemo.preferences"); + nemo_window_state = g_settings_new("org.nemo.window-state"); + nemo_icon_view_preferences = g_settings_new("org.nemo.icon-view"); + nemo_list_view_preferences = g_settings_new("org.nemo.list-view"); + nemo_compact_view_preferences = g_settings_new("org.nemo.compact-view"); + nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); } diff --git a/libnemo-private/nemo-icon-canvas-item.c b/libnemo-private/nemo-icon-canvas-item.c index d5335908c..76719067b 100644 --- a/libnemo-private/nemo-icon-canvas-item.c +++ b/libnemo-private/nemo-icon-canvas-item.c @@ -1232,7 +1232,7 @@ get_knob_pixbuf (void) "stock-nemo-knob", 8, 0, NULL); if (!knob_pixbuf) { - GInputStream *stream = g_resources_open_stream ("/org/gnome/nemo/icons/knob.png", 0, NULL); + GInputStream *stream = g_resources_open_stream ("/org/nemo/icons/knob.png", 0, NULL); if (stream != NULL) { knob_pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL); g_object_unref (stream); diff --git a/libnemo-private/nemo-thumbnails.c b/libnemo-private/nemo-thumbnails.c index 2a0818505..61710f08b 100644 --- a/libnemo-private/nemo-thumbnails.c +++ b/libnemo-private/nemo-thumbnails.c @@ -243,7 +243,7 @@ nemo_get_thumbnail_frame (void) static GdkPixbuf *thumbnail_frame = NULL; if (thumbnail_frame == NULL) { - GInputStream *stream = g_resources_open_stream ("/org/gnome/nemo/icons/thumbnail_frame.png", 0, NULL); + GInputStream *stream = g_resources_open_stream ("/org/nemo/icons/thumbnail_frame.png", 0, NULL); if (stream != NULL) { thumbnail_frame = gdk_pixbuf_new_from_stream (stream, NULL, NULL); g_object_unref (stream); diff --git a/libnemo-private/nemo.convert b/libnemo-private/nemo.convert index 39b542b10..c9bbb124e 100644 --- a/libnemo-private/nemo.convert +++ b/libnemo-private/nemo.convert @@ -1,4 +1,4 @@ -[org.gnome.nemo.preferences] +[org.nemo.preferences] tabs-open-position = /desktop/gnome/file_views/tabs_open_position always-use-browser = /apps/nemo/preferences/always_use_browser always-use-location-entry = /apps/nemo/preferences/always_use_location_entry @@ -30,26 +30,26 @@ default-folder-viewer = /apps/nemo/preferences/default_folder_viewer date-format = /apps/nemo/preferences/date_format show-hidden-files = /desktop/gnome/file_views/show_hidden_files -[org.gnome.nemo.icon-view] +[org.nemo.icon-view] captions = /apps/nemo/icon_view/captions labels-beside-icons = /apps/nemo/icon_view/labels_beside_icons default-zoom-level = /apps/nemo/icon_view/default_zoom_level thumbnail-size = /apps/nemo/icon_view/thumbnail_size text-ellipsis-limit = /apps/nemo/icon_view/text_ellipsis_limit -[org.gnome.nemo.compact-view] +[org.nemo.compact-view] default-zoom-level = /apps/nemo/compact_view/default_zoom_level all-columns-have-same-width = /apps/nemo/compact_view/all_columns_have_same_width -[org.gnome.nemo.list-view] +[org.nemo.list-view] default-zoom-level = /apps/nemo/list_view/default_zoom_level default-visible-columns = /apps/nemo/list_view/default_visible_columns default-column-order = /apps/nemo/list_view/default_column_order -[org.gnome.nemo.sidebar-panels.tree] +[org.nemo.sidebar-panels.tree] show-only-directories = /apps/nemo/sidebar_panels/tree/show_only_directories -[org.gnome.nemo.desktop] +[org.nemo.desktop] font = /apps/nemo/preferences/desktop_font home-icon-visible = /apps/nemo/desktop/home_icon_visible computer-icon-visible = /apps/nemo/desktop/computer_icon_visible @@ -62,7 +62,7 @@ trash-icon-name = /apps/nemo/desktop/trash_icon_name network-icon-name = /apps/nemo/desktop/network_icon_name text-ellipsis-limit = /apps/nemo/desktop/text_ellipsis_limit -[org.gnome.nemo.window-state] +[org.nemo.window-state] geometry = /apps/nemo/preferences/navigation_window_saved_geometry maximized = /apps/nemo/preferences/navigation_window_saved_maximized sidebar-width = /apps/nemo/preferences/sidebar_width diff --git a/libnemo-private/org.gnome.nemo.gschema.xml.in b/libnemo-private/org.nemo.gschema.xml.in similarity index 89% rename from libnemo-private/org.gnome.nemo.gschema.xml.in rename to libnemo-private/org.nemo.gschema.xml.in index 3a474ece2..70ec2ce9a 100644 --- a/libnemo-private/org.gnome.nemo.gschema.xml.in +++ b/libnemo-private/org.nemo.gschema.xml.in @@ -1,34 +1,34 @@ - + - + - + - + - + - + @@ -38,7 +38,7 @@ - + @@ -48,23 +48,23 @@ - + - - - - - - - - + + + + + + + + - - + + @@ -127,24 +127,24 @@ <_summary>Whether to enable immediate deletion <_description>If set to true, then Nemo will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution. - + 'local-only' <_summary>When to show preview text in icons <_description>Speed tradeoff for when to show a preview of text file contents in the file's icon. If set to "always" then always show previews, even if the folder is on a remote server. If set to "local-only" then only show previews for local file systems. If set to "never" then never bother to read preview data. - + 'local-only' <_summary>When to show number of items in a folder <_description>Speed tradeoff for when to show the number of items in a folder. If set to "always" then always show item counts, even if the folder is on a remote server. If set to "local-only" then only show counts for local file systems. If set to "never" then never bother to compute item counts. - + 'double' <_summary>Type of click used to launch/open files <_description>Possible values are "single" to launch files on a single click, or "double" to launch them on a double click. - + 'ask' <_summary>What to do with executable text files when activated <_description>What to do with executable text files when they are activated (single or double clicked). Possible values are "launch" to launch them as programs, "ask" to ask what to do via a dialog, and "display" to display them as text files. @@ -169,7 +169,7 @@ <_summary>Mouse button to activate the "Back" command in browser window <_description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Back" command in a browser window. Possible values range between 6 and 14. - + 'local-only' <_summary>When to show thumbnails of image files @@ -190,7 +190,7 @@ <_summary>Show folders first in windows <_description>If set to true, then Nemo shows folders prior to showing files in the icon and list views. - + @@ -208,7 +208,7 @@ <_summary>Nemo uses the users home folder as the desktop <_description>If set to true, then Nemo will use the user's home folder as the desktop. If it is false, then it will use ~/Desktop as the desktop. - + @@ -218,7 +218,7 @@ <_summary>Default folder viewer <_description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are "list-view", "icon-view" and "compact-view". - + 'locale' <_summary>Date Format <_description>The format of file dates. Possible values are "locale", "iso", and "informal". @@ -235,7 +235,7 @@ - + [ 'none', 'size', 'date_modified' ] <_summary>List of possible captions on icons @@ -250,7 +250,7 @@ <_summary>Put labels beside icons <_description>If true, labels will be placed beside icons rather than underneath them. - + 'standard' <_summary>Default icon zoom level <_description>Default zoom level used by the icon view. @@ -285,8 +285,8 @@ - - + + 'standard' <_summary>Default compact view zoom level <_description>Default zoom level used by the compact view. @@ -298,8 +298,8 @@ - - + + 'smaller' <_summary>Default list zoom level <_description>Default zoom level used by the list view. @@ -316,11 +316,11 @@ - - + + - + true <_summary>Only show folders in the tree side pane @@ -328,7 +328,7 @@ - + '' <_summary>Desktop font @@ -391,7 +391,7 @@ - + '' <_summary>The geometry string for a navigation window. diff --git a/src/nemo-application.c b/src/nemo-application.c index 7f093a7b6..664749abc 100644 --- a/src/nemo-application.c +++ b/src/nemo-application.c @@ -1229,7 +1229,7 @@ NemoApplication * nemo_application_get_singleton (void) { return g_object_new (NEMO_TYPE_APPLICATION, - "application-id", "org.gnome.NemoApplication", + "application-id", "org.NemoApplication", "flags", G_APPLICATION_HANDLES_OPEN, NULL); } diff --git a/src/nemo-bookmarks-window.c b/src/nemo-bookmarks-window.c index 27a1859e1..27dd06997 100644 --- a/src/nemo-bookmarks-window.c +++ b/src/nemo-bookmarks-window.c @@ -255,7 +255,7 @@ create_bookmarks_window (NemoBookmarkList *list, GObject *undo_manager_source) builder = gtk_builder_new (); if (!gtk_builder_add_from_resource (builder, - "/org/gnome/nemo/nemo-bookmarks-window.ui", + "/org/nemo/nemo-bookmarks-window.ui", NULL)) { return NULL; } diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c index 947fd81b0..2e0ec697b 100644 --- a/src/nemo-desktop-icon-view.c +++ b/src/nemo-desktop-icon-view.c @@ -796,7 +796,7 @@ real_merge_menus (NemoView *view) g_object_unref (action_group); /* owned by ui manager */ desktop_view->details->desktop_merge_id = - gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nemo/nemo-desktop-icon-view-ui.xml", NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-desktop-icon-view-ui.xml", NULL); } static NemoView * diff --git a/src/nemo-file-management-properties.c b/src/nemo-file-management-properties.c index a5f856a00..7ccb56c99 100644 --- a/src/nemo-file-management-properties.c +++ b/src/nemo-file-management-properties.c @@ -872,7 +872,7 @@ nemo_file_management_properties_dialog_show (GtkWindow *window) builder = gtk_builder_new (); gtk_builder_add_from_resource (builder, - "/org/gnome/nemo/nemo-file-management-properties.ui", + "/org/nemo/nemo-file-management-properties.ui", NULL); nemo_file_management_properties_dialog_setup (builder, window); diff --git a/src/nemo-icon-view.c b/src/nemo-icon-view.c index 79687d6e9..86f783a54 100644 --- a/src/nemo-icon-view.c +++ b/src/nemo-icon-view.c @@ -1385,7 +1385,7 @@ nemo_icon_view_merge_menus (NemoView *view) g_object_unref (action_group); /* owned by ui manager */ icon_view->details->icon_merge_id = - gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nemo/nemo-icon-view-ui.xml", NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-icon-view-ui.xml", NULL); /* Do one-time state-setting here; context-dependent state-setting * is done in update_menus. diff --git a/src/nemo-list-view.c b/src/nemo-list-view.c index ed54d7854..d9655e513 100644 --- a/src/nemo-list-view.c +++ b/src/nemo-list-view.c @@ -2640,7 +2640,7 @@ nemo_list_view_merge_menus (NemoView *view) g_object_unref (action_group); /* owned by ui manager */ list_view->details->list_merge_id = - gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nemo/nemo-list-view-ui.xml", NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-list-view-ui.xml", NULL); list_view->details->menus_ready = TRUE; } diff --git a/src/nemo-previewer.c b/src/nemo-previewer.c index b636d003b..5bc313fbf 100644 --- a/src/nemo-previewer.c +++ b/src/nemo-previewer.c @@ -30,9 +30,9 @@ G_DEFINE_TYPE (NemoPreviewer, nemo_previewer, G_TYPE_OBJECT); -#define PREVIEWER_DBUS_NAME "org.gnome.NemoPreviewer" -#define PREVIEWER_DBUS_IFACE "org.gnome.NemoPreviewer" -#define PREVIEWER_DBUS_PATH "/org/gnome/NemoPreviewer" +#define PREVIEWER_DBUS_NAME "org.NemoPreviewer" +#define PREVIEWER_DBUS_IFACE "org.NemoPreviewer" +#define PREVIEWER_DBUS_PATH "/org/NemoPreviewer" static NemoPreviewer *singleton = NULL; diff --git a/src/nemo-toolbar.c b/src/nemo-toolbar.c index 15d4d603e..4ab896754 100644 --- a/src/nemo-toolbar.c +++ b/src/nemo-toolbar.c @@ -133,7 +133,7 @@ nemo_toolbar_constructed (GObject *obj) /* add the UI */ self->priv->ui_manager = gtk_ui_manager_new (); - gtk_ui_manager_add_ui_from_resource (self->priv->ui_manager, "/org/gnome/nemo/nemo-toolbar-ui.xml", NULL); + gtk_ui_manager_add_ui_from_resource (self->priv->ui_manager, "/org/nemo/nemo-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/nemo-view.c b/src/nemo-view.c index a496acf89..0d271bc4e 100644 --- a/src/nemo-view.c +++ b/src/nemo-view.c @@ -7351,7 +7351,7 @@ real_merge_menus (NemoView *view) gtk_ui_manager_insert_action_group (ui_manager, action_group, -1); g_object_unref (action_group); /* owned by ui manager */ - view->details->dir_merge_id = gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nemo/nemo-directory-view-ui.xml", NULL); + view->details->dir_merge_id = gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-directory-view-ui.xml", NULL); view->details->scripts_invalid = TRUE; view->details->templates_invalid = TRUE; diff --git a/src/nemo-window-menus.c b/src/nemo-window-menus.c index 97e7fa0ed..97d520555 100644 --- a/src/nemo-window-menus.c +++ b/src/nemo-window-menus.c @@ -1346,7 +1346,7 @@ nemo_window_initialize_menus (NemoWindow *window) G_CALLBACK (disconnect_proxy_cb), window); /* add the UI */ - gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nemo/nemo-shell-ui.xml", NULL); + gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/nemo/nemo-shell-ui.xml", NULL); nemo_window_initialize_trash_icon_monitor (window); nemo_window_initialize_go_menu (window); diff --git a/src/nemo.gresource.xml b/src/nemo.gresource.xml index dc26c59d3..0b1fa308e 100644 --- a/src/nemo.gresource.xml +++ b/src/nemo.gresource.xml @@ -1,6 +1,6 @@ - + nemo-bookmarks-window.ui nemo-file-management-properties.ui nemo-icon-view-ui.xml