Schemas name

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

@@ -48,8 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = nemo.desktop.in \
-	nemo-autorun-software.desktop.in
+CONFIG_CLEAN_FILES = nemo.desktop.in nemo-autorun-software.desktop.in
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
@@ -96,8 +95,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(autostartdir)" \
 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \
 	"$(DESTDIR)$(nemodatadir)" "$(DESTDIR)$(servicedir)"
-DATA = $(autostart_DATA) $(desktop_DATA) $(mime_DATA) \
-	$(nemodata_DATA) $(service_DATA)
+DATA = $(autostart_DATA) $(desktop_DATA) $(mime_DATA) $(nemodata_DATA) \
+	$(service_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -335,7 +334,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 +826,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

libnemo-extension/Makefile.in

@@ -92,13 +92,12 @@ am__DEPENDENCIES_1 =
 libnemo_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
 am_libnemo_extension_la_OBJECTS = nemo-column-provider.lo \
-	nemo-column.lo nemo-extension-types.lo \
-	nemo-file-info.lo nemo-info-provider.lo \
-	nemo-location-widget-provider.lo nemo-menu-item.lo \
-	nemo-menu-provider.lo nemo-property-page-provider.lo \
-	nemo-property-page.lo nemo-menu.lo $(am__objects_1)
-libnemo_extension_la_OBJECTS =  \
-	$(am_libnemo_extension_la_OBJECTS)
+	nemo-column.lo nemo-extension-types.lo nemo-file-info.lo \
+	nemo-info-provider.lo nemo-location-widget-provider.lo \
+	nemo-menu-item.lo nemo-menu-provider.lo \
+	nemo-property-page-provider.lo nemo-property-page.lo \
+	nemo-menu.lo $(am__objects_1)
+libnemo_extension_la_OBJECTS = $(am_libnemo_extension_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -732,8 +731,8 @@ info: info-am
 info-am:
 
 install-data-am: install-girDATA \
-	install-libnemo_extension_includeHEADERS \
-	install-pkgconfigDATA install-typelibsDATA
+	install-libnemo_extension_includeHEADERS install-pkgconfigDATA \
+	install-typelibsDATA
 
 install-dvi: install-dvi-am
 

libnemo-private/Makefile.am

@@ -21,8 +21,8 @@ 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.					\
-		--c-namespace NemoDBus						\
+		--interface-prefix org.Nemo.						\
+		--c-namespace NemoDBus							\
 		--c-generate-object-manager						\
 		--generate-c-code nemo-generated					\
 		$(top_srcdir)/data/dbus-interfaces.xml					\
@@ -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)
 
@@ -226,3 +226,4 @@ CLEANFILES = \
 
 dist-hook:
 	cd $(distdir); rm -f $(CLEANFILES)
+

libnemo-private/Makefile.in

@@ -61,96 +61,82 @@ libnemo_private_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/libnemo-extension/libnemo-extension.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__libnemo_private_la_SOURCES_DIST = nemo-bookmark.c \
-	nemo-bookmark.h nemo-cell-renderer-text-ellipsized.c \
-	nemo-cell-renderer-text-ellipsized.h \
-	nemo-clipboard-monitor.c nemo-clipboard-monitor.h \
-	nemo-clipboard.c nemo-clipboard.h \
+am__libnemo_private_la_SOURCES_DIST = nemo-bookmark.c nemo-bookmark.h \
+	nemo-cell-renderer-text-ellipsized.c \
+	nemo-cell-renderer-text-ellipsized.h nemo-clipboard-monitor.c \
+	nemo-clipboard-monitor.h nemo-clipboard.c nemo-clipboard.h \
 	nemo-column-chooser.c nemo-column-chooser.h \
 	nemo-column-utilities.c nemo-column-utilities.h \
-	nemo-dbus-manager.c nemo-dbus-manager.h \
-	nemo-debug.c nemo-debug.h nemo-default-file-icon.c \
-	nemo-default-file-icon.h nemo-desktop-background.c \
-	nemo-desktop-background.h \
-	nemo-desktop-directory-file.c \
-	nemo-desktop-directory-file.h nemo-desktop-directory.c \
-	nemo-desktop-directory.h nemo-desktop-icon-file.c \
-	nemo-desktop-icon-file.h nemo-desktop-link-monitor.c \
-	nemo-desktop-link-monitor.h nemo-desktop-link.c \
-	nemo-desktop-link.h nemo-desktop-metadata.c \
-	nemo-desktop-metadata.h nemo-directory-async.c \
-	nemo-directory-notify.h nemo-directory-private.h \
-	nemo-directory.c nemo-directory.h nemo-dnd.c \
-	nemo-dnd.h nemo-entry.c nemo-entry.h \
+	nemo-dbus-manager.c nemo-dbus-manager.h nemo-debug.c \
+	nemo-debug.h nemo-default-file-icon.c nemo-default-file-icon.h \
+	nemo-desktop-background.c nemo-desktop-background.h \
+	nemo-desktop-directory-file.c nemo-desktop-directory-file.h \
+	nemo-desktop-directory.c nemo-desktop-directory.h \
+	nemo-desktop-icon-file.c nemo-desktop-icon-file.h \
+	nemo-desktop-link-monitor.c nemo-desktop-link-monitor.h \
+	nemo-desktop-link.c nemo-desktop-link.h \
+	nemo-desktop-metadata.c nemo-desktop-metadata.h \
+	nemo-directory-async.c nemo-directory-notify.h \
+	nemo-directory-private.h nemo-directory.c nemo-directory.h \
+	nemo-dnd.c nemo-dnd.h nemo-entry.c nemo-entry.h \
 	nemo-file-attributes.h nemo-file-changes-queue.c \
 	nemo-file-changes-queue.h nemo-file-conflict-dialog.c \
-	nemo-file-conflict-dialog.h nemo-file-dnd.c \
-	nemo-file-dnd.h nemo-file-operations.c \
-	nemo-file-operations.h nemo-file-private.h \
-	nemo-file-queue.c nemo-file-queue.h \
-	nemo-file-utilities.c nemo-file-utilities.h \
-	nemo-file.c nemo-file.h nemo-generated.c \
-	nemo-generated.h nemo-global-preferences.c \
-	nemo-global-preferences.h nemo-icon-canvas-item.c \
-	nemo-icon-canvas-item.h nemo-icon-container.c \
-	nemo-icon-container.h nemo-icon-dnd.c \
-	nemo-icon-dnd.h nemo-icon-private.h \
-	nemo-icon-info.c nemo-icon-info.h \
-	nemo-icon-names.h nemo-lib-self-check-functions.c \
-	nemo-lib-self-check-functions.h nemo-link.c \
-	nemo-link.h nemo-merged-directory.c \
-	nemo-merged-directory.h nemo-metadata.h \
-	nemo-metadata.c nemo-mime-application-chooser.c \
-	nemo-mime-application-chooser.h nemo-module.c \
-	nemo-module.h nemo-monitor.c nemo-monitor.h \
-	nemo-progress-info.c nemo-progress-info.h \
-	nemo-progress-info-manager.c \
+	nemo-file-conflict-dialog.h nemo-file-dnd.c nemo-file-dnd.h \
+	nemo-file-operations.c nemo-file-operations.h \
+	nemo-file-private.h nemo-file-queue.c nemo-file-queue.h \
+	nemo-file-utilities.c nemo-file-utilities.h nemo-file.c \
+	nemo-file.h nemo-generated.c nemo-generated.h \
+	nemo-global-preferences.c nemo-global-preferences.h \
+	nemo-icon-canvas-item.c nemo-icon-canvas-item.h \
+	nemo-icon-container.c nemo-icon-container.h nemo-icon-dnd.c \
+	nemo-icon-dnd.h nemo-icon-private.h nemo-icon-info.c \
+	nemo-icon-info.h nemo-icon-names.h \
+	nemo-lib-self-check-functions.c \
+	nemo-lib-self-check-functions.h nemo-link.c nemo-link.h \
+	nemo-merged-directory.c nemo-merged-directory.h \
+	nemo-metadata.h nemo-metadata.c \
+	nemo-mime-application-chooser.c \
+	nemo-mime-application-chooser.h nemo-module.c nemo-module.h \
+	nemo-monitor.c nemo-monitor.h nemo-progress-info.c \
+	nemo-progress-info.h nemo-progress-info-manager.c \
 	nemo-progress-info-manager.h nemo-program-choosing.c \
-	nemo-program-choosing.h nemo-recent.c \
-	nemo-recent.h nemo-saved-search-file.c \
-	nemo-saved-search-file.h nemo-search-directory.c \
-	nemo-search-directory.h nemo-search-directory-file.c \
-	nemo-search-directory-file.h nemo-search-engine.c \
-	nemo-search-engine.h nemo-search-engine-simple.c \
-	nemo-search-engine-simple.h \
-	nemo-selection-canvas-item.c \
-	nemo-selection-canvas-item.h nemo-signaller.h \
-	nemo-signaller.c nemo-query.c nemo-query.h \
-	nemo-thumbnails.c nemo-thumbnails.h \
-	nemo-trash-monitor.c nemo-trash-monitor.h \
-	nemo-tree-view-drag-dest.c nemo-tree-view-drag-dest.h \
-	nemo-ui-utilities.c nemo-ui-utilities.h \
-	nemo-undo-manager.c nemo-undo-manager.h \
+	nemo-program-choosing.h nemo-recent.c nemo-recent.h \
+	nemo-saved-search-file.c nemo-saved-search-file.h \
+	nemo-search-directory.c nemo-search-directory.h \
+	nemo-search-directory-file.c nemo-search-directory-file.h \
+	nemo-search-engine.c nemo-search-engine.h \
+	nemo-search-engine-simple.c nemo-search-engine-simple.h \
+	nemo-selection-canvas-item.c nemo-selection-canvas-item.h \
+	nemo-signaller.h nemo-signaller.c nemo-query.c nemo-query.h \
+	nemo-thumbnails.c nemo-thumbnails.h nemo-trash-monitor.c \
+	nemo-trash-monitor.h nemo-tree-view-drag-dest.c \
+	nemo-tree-view-drag-dest.h nemo-ui-utilities.c \
+	nemo-ui-utilities.h nemo-undo-manager.c nemo-undo-manager.h \
 	nemo-undo-private.h nemo-undo-signal-handlers.c \
 	nemo-undo-signal-handlers.h nemo-undo-transaction.c \
 	nemo-undo-transaction.h nemo-undo.c nemo-undo.h \
-	nemo-vfs-directory.c nemo-vfs-directory.h \
-	nemo-vfs-file.c nemo-vfs-file.h \
-	nemo-file-undo-operations.c \
+	nemo-vfs-directory.c nemo-vfs-directory.h nemo-vfs-file.c \
+	nemo-vfs-file.h nemo-file-undo-operations.c \
 	nemo-file-undo-operations.h nemo-file-undo-manager.c \
 	nemo-file-undo-manager.h nemo-search-engine-tracker.c \
 	nemo-search-engine-tracker.h
-@ENABLE_TRACKER_TRUE@am__objects_1 =  \
-@ENABLE_TRACKER_TRUE@	nemo-search-engine-tracker.lo
+@ENABLE_TRACKER_TRUE@am__objects_1 = nemo-search-engine-tracker.lo
 am__objects_2 =
 am_libnemo_private_la_OBJECTS = nemo-bookmark.lo \
 	nemo-cell-renderer-text-ellipsized.lo \
 	nemo-clipboard-monitor.lo nemo-clipboard.lo \
 	nemo-column-chooser.lo nemo-column-utilities.lo \
-	nemo-dbus-manager.lo nemo-debug.lo \
-	nemo-default-file-icon.lo nemo-desktop-background.lo \
-	nemo-desktop-directory-file.lo \
+	nemo-dbus-manager.lo nemo-debug.lo nemo-default-file-icon.lo \
+	nemo-desktop-background.lo nemo-desktop-directory-file.lo \
 	nemo-desktop-directory.lo nemo-desktop-icon-file.lo \
 	nemo-desktop-link-monitor.lo nemo-desktop-link.lo \
 	nemo-desktop-metadata.lo nemo-directory-async.lo \
 	nemo-directory.lo nemo-dnd.lo nemo-entry.lo \
-	nemo-file-changes-queue.lo \
-	nemo-file-conflict-dialog.lo nemo-file-dnd.lo \
-	nemo-file-operations.lo nemo-file-queue.lo \
-	nemo-file-utilities.lo nemo-file.lo \
-	nemo-generated.lo nemo-global-preferences.lo \
-	nemo-icon-canvas-item.lo nemo-icon-container.lo \
-	nemo-icon-dnd.lo nemo-icon-info.lo \
+	nemo-file-changes-queue.lo nemo-file-conflict-dialog.lo \
+	nemo-file-dnd.lo nemo-file-operations.lo nemo-file-queue.lo \
+	nemo-file-utilities.lo nemo-file.lo nemo-generated.lo \
+	nemo-global-preferences.lo nemo-icon-canvas-item.lo \
+	nemo-icon-container.lo nemo-icon-dnd.lo nemo-icon-info.lo \
 	nemo-lib-self-check-functions.lo nemo-link.lo \
 	nemo-merged-directory.lo nemo-metadata.lo \
 	nemo-mime-application-chooser.lo nemo-module.lo \
@@ -159,19 +145,16 @@ am_libnemo_private_la_OBJECTS = nemo-bookmark.lo \
 	nemo-recent.lo nemo-saved-search-file.lo \
 	nemo-search-directory.lo nemo-search-directory-file.lo \
 	nemo-search-engine.lo nemo-search-engine-simple.lo \
-	nemo-selection-canvas-item.lo nemo-signaller.lo \
-	nemo-query.lo nemo-thumbnails.lo \
-	nemo-trash-monitor.lo nemo-tree-view-drag-dest.lo \
-	nemo-ui-utilities.lo nemo-undo-manager.lo \
-	nemo-undo-signal-handlers.lo nemo-undo-transaction.lo \
-	nemo-undo.lo nemo-vfs-directory.lo \
+	nemo-selection-canvas-item.lo nemo-signaller.lo nemo-query.lo \
+	nemo-thumbnails.lo nemo-trash-monitor.lo \
+	nemo-tree-view-drag-dest.lo nemo-ui-utilities.lo \
+	nemo-undo-manager.lo nemo-undo-signal-handlers.lo \
+	nemo-undo-transaction.lo nemo-undo.lo nemo-vfs-directory.lo \
 	nemo-vfs-file.lo nemo-file-undo-operations.lo \
-	nemo-file-undo-manager.lo $(am__objects_1) \
-	$(am__objects_2)
+	nemo-file-undo-manager.lo $(am__objects_1) $(am__objects_2)
 am__objects_3 = nemo-generated.lo
 am__objects_4 = $(am__objects_3) $(am__objects_2)
-nodist_libnemo_private_la_OBJECTS = $(am__objects_4) \
-	$(am__objects_2)
+nodist_libnemo_private_la_OBJECTS = $(am__objects_4) $(am__objects_2)
 libnemo_private_la_OBJECTS = $(am_libnemo_private_la_OBJECTS) \
 	$(nodist_libnemo_private_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -616,7 +599,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,8 +993,8 @@ uninstall-am: uninstall-convertDATA
 
 $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml
 	gdbus-codegen									\
-		--interface-prefix org.gnome.Nemo.					\
-		--c-namespace NemoDBus						\
+		--interface-prefix org.Nemo.						\
+		--c-namespace NemoDBus							\
 		--c-generate-object-manager						\
 		--generate-c-code nemo-generated					\
 		$(top_srcdir)/data/dbus-interfaces.xml					\

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