Merge pull request #3 from haxar/master

gsd to msd complete rename patch by NiceandGently

5 files changed, 15 insertions, 15 deletions

diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 8b861b9..87f0eab 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -5,10 +5,10 @@ plugin_LTLIBRARIES = \
 	$(NULL)
 
 libxsettings_la_SOURCES = 	\
-	gsd-xsettings-plugin.h	\
-	gsd-xsettings-plugin.c	\
-	gsd-xsettings-manager.h	\
-	gsd-xsettings-manager.c	\
+	msd-xsettings-plugin.h	\
+	msd-xsettings-plugin.c	\
+	msd-xsettings-manager.h	\
+	msd-xsettings-manager.c	\
 	xsettings-common.h	\
 	xsettings-common.c	\
 	xsettings-manager.h	\
@@ -25,7 +25,7 @@ libxsettings_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libxsettings_la_LDFLAGS = 	\
-	$(GSD_PLUGIN_LDFLAGS)	\
+	$(MSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libxsettings_la_LIBADD  = 	\
@@ -62,4 +62,4 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)		\
 	$(NULL)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
index e7b4f9a..9df8f61 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/msd-xsettings-manager.c
@@ -41,7 +41,7 @@
 #include <mateconf/mateconf-client.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-xsettings-manager.h"
+#include "msd-xsettings-manager.h"
 #include "xsettings-manager.h"
 #ifdef HAVE_FONTCONFIG
 #include "fontconfig-monitor.h"
@@ -100,10 +100,10 @@ struct MateXSettingsManagerPrivate
 #endif /* HAVE_FONTCONFIG */
 };
 
-#define GSD_XSETTINGS_ERROR gsd_xsettings_error_quark ()
+#define MSD_XSETTINGS_ERROR msd_xsettings_error_quark ()
 
 enum {
-        GSD_XSETTINGS_ERROR_INIT
+        MSD_XSETTINGS_ERROR_INIT
 };
 
 static void     mate_xsettings_manager_class_init  (MateXSettingsManagerClass *klass);
@@ -115,9 +115,9 @@ G_DEFINE_TYPE (MateXSettingsManager, mate_xsettings_manager, G_TYPE_OBJECT)
 static gpointer manager_object = NULL;
 
 static GQuark
-gsd_xsettings_error_quark (void)
+msd_xsettings_error_quark (void)
 {
-        return g_quark_from_static_string ("gsd-xsettings-error-quark");
+        return g_quark_from_static_string ("msd-xsettings-error-quark");
 }
 
 static void
@@ -802,8 +802,8 @@ mate_xsettings_manager_start (MateXSettingsManager *manager,
         mate_settings_profile_start (NULL);
 
         if (!setup_xsettings_managers (manager)) {
-                g_set_error (error, GSD_XSETTINGS_ERROR,
-                             GSD_XSETTINGS_ERROR_INIT,
+                g_set_error (error, MSD_XSETTINGS_ERROR,
+                             MSD_XSETTINGS_ERROR_INIT,
                              "Could not initialize xsettings manager.");
                 return FALSE;
         }
diff --git a/plugins/xsettings/gsd-xsettings-manager.h b/plugins/xsettings/msd-xsettings-manager.h
index b97afbf..b97afbf 100644
--- a/plugins/xsettings/gsd-xsettings-manager.h
+++ b/plugins/xsettings/msd-xsettings-manager.h
diff --git a/plugins/xsettings/gsd-xsettings-plugin.c b/plugins/xsettings/msd-xsettings-plugin.c
index 2280589..50af53a 100644
--- a/plugins/xsettings/gsd-xsettings-plugin.c
+++ b/plugins/xsettings/msd-xsettings-plugin.c
@@ -24,8 +24,8 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-xsettings-plugin.h"
-#include "gsd-xsettings-manager.h"
+#include "msd-xsettings-plugin.h"
+#include "msd-xsettings-manager.h"
 
 struct MateXSettingsPluginPrivate {
         MateXSettingsManager *manager;
diff --git a/plugins/xsettings/gsd-xsettings-plugin.h b/plugins/xsettings/msd-xsettings-plugin.h
index 88c8331..88c8331 100644
--- a/plugins/xsettings/gsd-xsettings-plugin.h
+++ b/plugins/xsettings/msd-xsettings-plugin.h