Merge pull request linuxmint#10 from dalcde/remove-nemo

Renamed org.gnome.nemo to org.nemo

Author: clefebvre

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