gsd to msd complete rename patch by NiceandGently; code changes commit

5 files changed, 100 insertions, 100 deletions

diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 0f77530..c578fd8 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -2,10 +2,10 @@ plugin_LTLIBRARIES = \
 	libdummy.la
 
 libdummy_la_SOURCES = 		\
-	gsd-dummy-manager.c	\
-	gsd-dummy-manager.h	\
-	gsd-dummy-plugin.c	\
-	gsd-dummy-plugin.h
+	msd-dummy-manager.c	\
+	msd-dummy-manager.h	\
+	msd-dummy-plugin.c	\
+	msd-dummy-plugin.h
 
 libdummy_la_CPPFLAGS = \
 	-I$(top_srcdir)/mate-settings-daemon		\
@@ -17,7 +17,7 @@ libdummy_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libdummy_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)
+	$(MSD_PLUGIN_LDFLAGS)
 
 libdummy_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)
@@ -36,7 +36,7 @@ CLEANFILES = 			\
 DISTCLEANFILES =		\
 	$(plugin_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
 
 # override to _not_ install the test plugin
 # do not copy into your plugin
diff --git a/plugins/dummy/gsd-dummy-manager.c b/plugins/dummy/gsd-dummy-manager.c
index 568c832..2744aeb 100644
--- a/plugins/dummy/gsd-dummy-manager.c
+++ b/plugins/dummy/gsd-dummy-manager.c
@@ -37,11 +37,11 @@
 #include <gtk/gtk.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-dummy-manager.h"
+#include "msd-dummy-manager.h"
 
-#define GSD_DUMMY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_DUMMY_MANAGER, GsdDummyManagerPrivate))
+#define MSD_DUMMY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_DUMMY_MANAGER, MsdDummyManagerPrivate))
 
-struct GsdDummyManagerPrivate
+struct MsdDummyManagerPrivate
 {
         gboolean padding;
 };
@@ -50,16 +50,16 @@ enum {
         PROP_0,
 };
 
-static void     gsd_dummy_manager_class_init  (GsdDummyManagerClass *klass);
-static void     gsd_dummy_manager_init        (GsdDummyManager      *dummy_manager);
-static void     gsd_dummy_manager_finalize    (GObject             *object);
+static void     msd_dummy_manager_class_init  (MsdDummyManagerClass *klass);
+static void     msd_dummy_manager_init        (MsdDummyManager      *dummy_manager);
+static void     msd_dummy_manager_finalize    (GObject             *object);
 
-G_DEFINE_TYPE (GsdDummyManager, gsd_dummy_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdDummyManager, msd_dummy_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
 gboolean
-gsd_dummy_manager_start (GsdDummyManager *manager,
+msd_dummy_manager_start (MsdDummyManager *manager,
                                GError               **error)
 {
         g_debug ("Starting dummy manager");
@@ -69,20 +69,20 @@ gsd_dummy_manager_start (GsdDummyManager *manager,
 }
 
 void
-gsd_dummy_manager_stop (GsdDummyManager *manager)
+msd_dummy_manager_stop (MsdDummyManager *manager)
 {
         g_debug ("Stopping dummy manager");
 }
 
 static void
-gsd_dummy_manager_set_property (GObject        *object,
+msd_dummy_manager_set_property (GObject        *object,
                                guint           prop_id,
                                const GValue   *value,
                                GParamSpec     *pspec)
 {
-        GsdDummyManager *self;
+        MsdDummyManager *self;
 
-        self = GSD_DUMMY_MANAGER (object);
+        self = MSD_DUMMY_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -92,14 +92,14 @@ gsd_dummy_manager_set_property (GObject        *object,
 }
 
 static void
-gsd_dummy_manager_get_property (GObject        *object,
+msd_dummy_manager_get_property (GObject        *object,
                                guint           prop_id,
                                GValue         *value,
                                GParamSpec     *pspec)
 {
-        GsdDummyManager *self;
+        MsdDummyManager *self;
 
-        self = GSD_DUMMY_MANAGER (object);
+        self = MSD_DUMMY_MANAGER (object);
 
         switch (prop_id) {
         default:
@@ -109,16 +109,16 @@ gsd_dummy_manager_get_property (GObject        *object,
 }
 
 static GObject *
-gsd_dummy_manager_constructor (GType                  type,
+msd_dummy_manager_constructor (GType                  type,
                               guint                  n_construct_properties,
                               GObjectConstructParam *construct_properties)
 {
-        GsdDummyManager      *dummy_manager;
-        GsdDummyManagerClass *klass;
+        MsdDummyManager      *dummy_manager;
+        MsdDummyManagerClass *klass;
 
-        klass = GSD_DUMMY_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_DUMMY_MANAGER));
+        klass = MSD_DUMMY_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_DUMMY_MANAGER));
 
-        dummy_manager = GSD_DUMMY_MANAGER (G_OBJECT_CLASS (gsd_dummy_manager_parent_class)->constructor (type,
+        dummy_manager = MSD_DUMMY_MANAGER (G_OBJECT_CLASS (msd_dummy_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
                                                                                                       construct_properties));
 
@@ -126,61 +126,61 @@ gsd_dummy_manager_constructor (GType                  type,
 }
 
 static void
-gsd_dummy_manager_dispose (GObject *object)
+msd_dummy_manager_dispose (GObject *object)
 {
-        GsdDummyManager *dummy_manager;
+        MsdDummyManager *dummy_manager;
 
-        dummy_manager = GSD_DUMMY_MANAGER (object);
+        dummy_manager = MSD_DUMMY_MANAGER (object);
 
-        G_OBJECT_CLASS (gsd_dummy_manager_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_dummy_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_dummy_manager_class_init (GsdDummyManagerClass *klass)
+msd_dummy_manager_class_init (MsdDummyManagerClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->get_property = gsd_dummy_manager_get_property;
-        object_class->set_property = gsd_dummy_manager_set_property;
-        object_class->constructor = gsd_dummy_manager_constructor;
-        object_class->dispose = gsd_dummy_manager_dispose;
-        object_class->finalize = gsd_dummy_manager_finalize;
+        object_class->get_property = msd_dummy_manager_get_property;
+        object_class->set_property = msd_dummy_manager_set_property;
+        object_class->constructor = msd_dummy_manager_constructor;
+        object_class->dispose = msd_dummy_manager_dispose;
+        object_class->finalize = msd_dummy_manager_finalize;
 
-        g_type_class_add_private (klass, sizeof (GsdDummyManagerPrivate));
+        g_type_class_add_private (klass, sizeof (MsdDummyManagerPrivate));
 }
 
 static void
-gsd_dummy_manager_init (GsdDummyManager *manager)
+msd_dummy_manager_init (MsdDummyManager *manager)
 {
-        manager->priv = GSD_DUMMY_MANAGER_GET_PRIVATE (manager);
+        manager->priv = MSD_DUMMY_MANAGER_GET_PRIVATE (manager);
 
 }
 
 static void
-gsd_dummy_manager_finalize (GObject *object)
+msd_dummy_manager_finalize (GObject *object)
 {
-        GsdDummyManager *dummy_manager;
+        MsdDummyManager *dummy_manager;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_DUMMY_MANAGER (object));
+        g_return_if_fail (MSD_IS_DUMMY_MANAGER (object));
 
-        dummy_manager = GSD_DUMMY_MANAGER (object);
+        dummy_manager = MSD_DUMMY_MANAGER (object);
 
         g_return_if_fail (dummy_manager->priv != NULL);
 
-        G_OBJECT_CLASS (gsd_dummy_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_dummy_manager_parent_class)->finalize (object);
 }
 
-GsdDummyManager *
-gsd_dummy_manager_new (void)
+MsdDummyManager *
+msd_dummy_manager_new (void)
 {
         if (manager_object != NULL) {
                 g_object_ref (manager_object);
         } else {
-                manager_object = g_object_new (GSD_TYPE_DUMMY_MANAGER, NULL);
+                manager_object = g_object_new (MSD_TYPE_DUMMY_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
         }
 
-        return GSD_DUMMY_MANAGER (manager_object);
+        return MSD_DUMMY_MANAGER (manager_object);
 }
diff --git a/plugins/dummy/gsd-dummy-manager.h b/plugins/dummy/gsd-dummy-manager.h
index ba63560..91f989a 100644
--- a/plugins/dummy/gsd-dummy-manager.h
+++ b/plugins/dummy/gsd-dummy-manager.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_DUMMY_MANAGER_H
-#define __GSD_DUMMY_MANAGER_H
+#ifndef __MSD_DUMMY_MANAGER_H
+#define __MSD_DUMMY_MANAGER_H
 
 #include <glib-object.h>
 
@@ -27,35 +27,35 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_DUMMY_MANAGER         (gsd_dummy_manager_get_type ())
-#define GSD_DUMMY_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_DUMMY_MANAGER, GsdDummyManager))
-#define GSD_DUMMY_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_DUMMY_MANAGER, GsdDummyManagerClass))
-#define GSD_IS_DUMMY_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_DUMMY_MANAGER))
-#define GSD_IS_DUMMY_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_DUMMY_MANAGER))
-#define GSD_DUMMY_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_DUMMY_MANAGER, GsdDummyManagerClass))
+#define MSD_TYPE_DUMMY_MANAGER         (msd_dummy_manager_get_type ())
+#define MSD_DUMMY_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_DUMMY_MANAGER, MsdDummyManager))
+#define MSD_DUMMY_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_DUMMY_MANAGER, MsdDummyManagerClass))
+#define MSD_IS_DUMMY_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_DUMMY_MANAGER))
+#define MSD_IS_DUMMY_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_DUMMY_MANAGER))
+#define MSD_DUMMY_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_DUMMY_MANAGER, MsdDummyManagerClass))
 
-typedef struct GsdDummyManagerPrivate GsdDummyManagerPrivate;
+typedef struct MsdDummyManagerPrivate MsdDummyManagerPrivate;
 
 typedef struct
 {
         GObject                     parent;
-        GsdDummyManagerPrivate *priv;
-} GsdDummyManager;
+        MsdDummyManagerPrivate *priv;
+} MsdDummyManager;
 
 typedef struct
 {
         GObjectClass   parent_class;
-} GsdDummyManagerClass;
+} MsdDummyManagerClass;
 
-GType                   gsd_dummy_manager_get_type            (void);
+GType                   msd_dummy_manager_get_type            (void);
 
-GsdDummyManager *       gsd_dummy_manager_new                 (void);
-gboolean                gsd_dummy_manager_start               (GsdDummyManager *manager,
+MsdDummyManager *       msd_dummy_manager_new                 (void);
+gboolean                msd_dummy_manager_start               (MsdDummyManager *manager,
                                                                GError         **error);
-void                    gsd_dummy_manager_stop                (GsdDummyManager *manager);
+void                    msd_dummy_manager_stop                (MsdDummyManager *manager);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_DUMMY_MANAGER_H */
+#endif /* __MSD_DUMMY_MANAGER_H */
diff --git a/plugins/dummy/gsd-dummy-plugin.c b/plugins/dummy/gsd-dummy-plugin.c
index f284423..c1e18bb 100644
--- a/plugins/dummy/gsd-dummy-plugin.c
+++ b/plugins/dummy/gsd-dummy-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-dummy-plugin.h"
-#include "gsd-dummy-manager.h"
+#include "msd-dummy-plugin.h"
+#include "msd-dummy-manager.h"
 
-struct GsdDummyPluginPrivate {
-        GsdDummyManager *manager;
+struct MsdDummyPluginPrivate {
+        MsdDummyManager *manager;
 };
 
-#define GSD_DUMMY_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_DUMMY_PLUGIN, GsdDummyPluginPrivate))
+#define MSD_DUMMY_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_DUMMY_PLUGIN, MsdDummyPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdDummyPlugin, gsd_dummy_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdDummyPlugin, msd_dummy_plugin)
 
 static void
-gsd_dummy_plugin_init (GsdDummyPlugin *plugin)
+msd_dummy_plugin_init (MsdDummyPlugin *plugin)
 {
-        plugin->priv = GSD_DUMMY_PLUGIN_GET_PRIVATE (plugin);
+        plugin->priv = MSD_DUMMY_PLUGIN_GET_PRIVATE (plugin);
 
-        g_debug ("GsdDummyPlugin initializing");
+        g_debug ("MsdDummyPlugin initializing");
 
-        plugin->priv->manager = gsd_dummy_manager_new ();
+        plugin->priv->manager = msd_dummy_manager_new ();
 }
 
 static void
-gsd_dummy_plugin_finalize (GObject *object)
+msd_dummy_plugin_finalize (GObject *object)
 {
-        GsdDummyPlugin *plugin;
+        MsdDummyPlugin *plugin;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_DUMMY_PLUGIN (object));
+        g_return_if_fail (MSD_IS_DUMMY_PLUGIN (object));
 
-        g_debug ("GsdDummyPlugin finalizing");
+        g_debug ("MsdDummyPlugin finalizing");
 
-        plugin = GSD_DUMMY_PLUGIN (object);
+        plugin = MSD_DUMMY_PLUGIN (object);
 
         g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_dummy_plugin_finalize (GObject *object)
                 g_object_unref (plugin->priv->manager);
         }
 
-        G_OBJECT_CLASS (gsd_dummy_plugin_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_dummy_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
         g_debug ("Activating dummy plugin");
 
         error = NULL;
-        res = gsd_dummy_manager_start (GSD_DUMMY_PLUGIN (plugin)->priv->manager, &error);
+        res = msd_dummy_manager_start (MSD_DUMMY_PLUGIN (plugin)->priv->manager, &error);
         if (! res) {
                 g_warning ("Unable to start dummy manager: %s", error->message);
                 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
         g_debug ("Deactivating dummy plugin");
-        gsd_dummy_manager_stop (GSD_DUMMY_PLUGIN (plugin)->priv->manager);
+        msd_dummy_manager_stop (MSD_DUMMY_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_dummy_plugin_class_init (GsdDummyPluginClass *klass)
+msd_dummy_plugin_class_init (MsdDummyPluginClass *klass)
 {
         GObjectClass           *object_class = G_OBJECT_CLASS (klass);
         MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
-        object_class->finalize = gsd_dummy_plugin_finalize;
+        object_class->finalize = msd_dummy_plugin_finalize;
 
         plugin_class->activate = impl_activate;
         plugin_class->deactivate = impl_deactivate;
 
-        g_type_class_add_private (klass, sizeof (GsdDummyPluginPrivate));
+        g_type_class_add_private (klass, sizeof (MsdDummyPluginPrivate));
 }
diff --git a/plugins/dummy/gsd-dummy-plugin.h b/plugins/dummy/gsd-dummy-plugin.h
index 153e0fa..f07f78c 100644
--- a/plugins/dummy/gsd-dummy-plugin.h
+++ b/plugins/dummy/gsd-dummy-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_DUMMY_PLUGIN_H__
-#define __GSD_DUMMY_PLUGIN_H__
+#ifndef __MSD_DUMMY_PLUGIN_H__
+#define __MSD_DUMMY_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_DUMMY_PLUGIN                (gsd_dummy_plugin_get_type ())
-#define GSD_DUMMY_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_DUMMY_PLUGIN, GsdDummyPlugin))
-#define GSD_DUMMY_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_DUMMY_PLUGIN, GsdDummyPluginClass))
-#define GSD_IS_DUMMY_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_DUMMY_PLUGIN))
-#define GSD_IS_DUMMY_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_DUMMY_PLUGIN))
-#define GSD_DUMMY_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_DUMMY_PLUGIN, GsdDummyPluginClass))
+#define MSD_TYPE_DUMMY_PLUGIN                (msd_dummy_plugin_get_type ())
+#define MSD_DUMMY_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_DUMMY_PLUGIN, MsdDummyPlugin))
+#define MSD_DUMMY_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_DUMMY_PLUGIN, MsdDummyPluginClass))
+#define MSD_IS_DUMMY_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_DUMMY_PLUGIN))
+#define MSD_IS_DUMMY_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_DUMMY_PLUGIN))
+#define MSD_DUMMY_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_DUMMY_PLUGIN, MsdDummyPluginClass))
 
-typedef struct GsdDummyPluginPrivate GsdDummyPluginPrivate;
+typedef struct MsdDummyPluginPrivate MsdDummyPluginPrivate;
 
 typedef struct
 {
         MateSettingsPlugin    parent;
-        GsdDummyPluginPrivate *priv;
-} GsdDummyPlugin;
+        MsdDummyPluginPrivate *priv;
+} MsdDummyPlugin;
 
 typedef struct
 {
         MateSettingsPluginClass parent_class;
-} GsdDummyPluginClass;
+} MsdDummyPluginClass;
 
-GType   gsd_dummy_plugin_get_type            (void) G_GNUC_CONST;
+GType   msd_dummy_plugin_get_type            (void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
 G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module);
@@ -60,4 +60,4 @@ G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module);
 }
 #endif
 
-#endif /* __GSD_DUMMY_PLUGIN_H__ */
+#endif /* __MSD_DUMMY_PLUGIN_H__ */