Renamed org.gnome.nemo to org.nemo

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

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

data/dbus-interfaces.xml

@@ -24,7 +24,7 @@
 -->
 
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name='org.gnome.Nemo.FileOperations'>
+  <interface name='org.Nemo.FileOperations'>
     <method name='CopyURIs'>
       <arg type='as' name='SourceFilesURIList' direction='in'/>
       <arg type='s' name='DestinationDirectoryURI' direction='in'/>

data/org.gnome.Nemo.service.in → 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

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

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

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)
 

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					\

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,

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;
 }
 

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");
 }

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);

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);

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