Merge pull request #3 from haxar/master

gsd to msd complete rename patch by NiceandGently

5 files changed, 99 insertions, 99 deletions

diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index 7caf2ac..3e93c7c 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -2,10 +2,10 @@ plugin_LTLIBRARIES = \
 	libsound.la
 
 libsound_la_SOURCES = \
-	gsd-sound-plugin.h \
-	gsd-sound-plugin.c \
-	gsd-sound-manager.h \
-	gsd-sound-manager.c
+	msd-sound-plugin.h \
+	msd-sound-plugin.c \
+	msd-sound-manager.h \
+	msd-sound-manager.c
 
 libsound_la_CPPFLAGS = \
 	-I$(top_srcdir)/mate-settings-daemon \
@@ -19,7 +19,7 @@ libsound_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsound_la_LDFLAGS = \
-	$(GSD_PLUGIN_LDFLAGS)
+	$(MSD_PLUGIN_LDFLAGS)
 
 libsound_la_LIBADD = \
 	$(SETTINGS_PLUGIN_LIBS)	\
@@ -39,4 +39,4 @@ CLEANFILES = \
 DISTCLEANFILES = \
 	$(plugin_DATA)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/sound/gsd-sound-manager.c b/plugins/sound/msd-sound-manager.c
index 4b32130..23fb240 100644
--- a/plugins/sound/gsd-sound-manager.c
+++ b/plugins/sound/msd-sound-manager.c
@@ -40,12 +40,12 @@
 #include <pulse/pulseaudio.h>
 #endif
 
-#include "gsd-sound-manager.h"
+#include "msd-sound-manager.h"
 #include "mate-settings-profile.h"
 
-#define GSD_SOUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_SOUND_MANAGER, GsdSoundManagerPrivate))
+#define MSD_SOUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_SOUND_MANAGER, MsdSoundManagerPrivate))
 
-struct GsdSoundManagerPrivate
+struct MsdSoundManagerPrivate
 {
         guint mateconf_notify;
         GList* monitors;
@@ -54,11 +54,11 @@ struct GsdSoundManagerPrivate
 
 #define MATECONF_SOUND_DIR "/desktop/mate/sound"
 
-static void gsd_sound_manager_class_init (GsdSoundManagerClass *klass);
-static void gsd_sound_manager_init (GsdSoundManager *sound_manager);
-static void gsd_sound_manager_finalize (GObject *object);
+static void msd_sound_manager_class_init (MsdSoundManagerClass *klass);
+static void msd_sound_manager_init (MsdSoundManager *sound_manager);
+static void msd_sound_manager_finalize (GObject *object);
 
-G_DEFINE_TYPE (GsdSoundManager, gsd_sound_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdSoundManager, msd_sound_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
@@ -185,7 +185,7 @@ fail:
 }
 
 static gboolean
-flush_cb (GsdSoundManager *manager)
+flush_cb (MsdSoundManager *manager)
 {
         flush_cache ();
         manager->priv->timeout = 0;
@@ -193,7 +193,7 @@ flush_cb (GsdSoundManager *manager)
 }
 
 static void
-trigger_flush (GsdSoundManager *manager)
+trigger_flush (MsdSoundManager *manager)
 {
 
         if (manager->priv->timeout)
@@ -208,13 +208,13 @@ static void
 mateconf_client_notify_cb (MateConfClient *client,
                         guint cnxn_id,
                         MateConfEntry *entry,
-                        GsdSoundManager *manager)
+                        MsdSoundManager *manager)
 {
         trigger_flush (manager);
 }
 
 static gboolean
-register_config_callback (GsdSoundManager *manager, GError **error)
+register_config_callback (MsdSoundManager *manager, GError **error)
 {
         MateConfClient *client;
         gboolean succ;
@@ -239,14 +239,14 @@ file_monitor_changed_cb (GFileMonitor *monitor,
                          GFile *file,
                          GFile *other_file,
                          GFileMonitorEvent event,
-                         GsdSoundManager *manager)
+                         MsdSoundManager *manager)
 {
         g_debug ("Theme dir changed");
         trigger_flush (manager);
 }
 
 static gboolean
-register_directory_callback (GsdSoundManager *manager,
+register_directory_callback (MsdSoundManager *manager,
                              const char *path,
                              GError **error)
 {
@@ -276,7 +276,7 @@ register_directory_callback (GsdSoundManager *manager,
 #endif
 
 gboolean
-gsd_sound_manager_start (GsdSoundManager *manager,
+msd_sound_manager_start (MsdSoundManager *manager,
                          GError **error)
 {
 
@@ -326,7 +326,7 @@ gsd_sound_manager_start (GsdSoundManager *manager,
 }
 
 void
-gsd_sound_manager_stop (GsdSoundManager *manager)
+msd_sound_manager_stop (MsdSoundManager *manager)
 {
         g_debug ("Stopping sound manager");
 
@@ -356,17 +356,17 @@ gsd_sound_manager_stop (GsdSoundManager *manager)
 }
 
 static GObject *
-gsd_sound_manager_constructor (
+msd_sound_manager_constructor (
                 GType type,
                 guint n_construct_properties,
                 GObjectConstructParam *construct_properties)
 {
-        GsdSoundManager *m;
-        GsdSoundManagerClass *klass;
+        MsdSoundManager *m;
+        MsdSoundManagerClass *klass;
 
-        klass = GSD_SOUND_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_SOUND_MANAGER));
+        klass = MSD_SOUND_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_SOUND_MANAGER));
 
-        m = GSD_SOUND_MANAGER (G_OBJECT_CLASS (gsd_sound_manager_parent_class)->constructor (
+        m = MSD_SOUND_MANAGER (G_OBJECT_CLASS (msd_sound_manager_parent_class)->constructor (
                                                            type,
                                                            n_construct_properties,
                                                            construct_properties));
@@ -375,59 +375,59 @@ gsd_sound_manager_constructor (
 }
 
 static void
-gsd_sound_manager_dispose (GObject *object)
+msd_sound_manager_dispose (GObject *object)
 {
-        GsdSoundManager *manager;
+        MsdSoundManager *manager;
 
-        manager = GSD_SOUND_MANAGER (object);
+        manager = MSD_SOUND_MANAGER (object);
 
-        gsd_sound_manager_stop (manager);
+        msd_sound_manager_stop (manager);
 
-        G_OBJECT_CLASS (gsd_sound_manager_parent_class)->dispose (object);
+        G_OBJECT_CLASS (msd_sound_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_sound_manager_class_init (GsdSoundManagerClass *klass)
+msd_sound_manager_class_init (MsdSoundManagerClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->constructor = gsd_sound_manager_constructor;
-        object_class->dispose = gsd_sound_manager_dispose;
-        object_class->finalize = gsd_sound_manager_finalize;
+        object_class->constructor = msd_sound_manager_constructor;
+        object_class->dispose = msd_sound_manager_dispose;
+        object_class->finalize = msd_sound_manager_finalize;
 
-        g_type_class_add_private (klass, sizeof (GsdSoundManagerPrivate));
+        g_type_class_add_private (klass, sizeof (MsdSoundManagerPrivate));
 }
 
 static void
-gsd_sound_manager_init (GsdSoundManager *manager)
+msd_sound_manager_init (MsdSoundManager *manager)
 {
-        manager->priv = GSD_SOUND_MANAGER_GET_PRIVATE (manager);
+        manager->priv = MSD_SOUND_MANAGER_GET_PRIVATE (manager);
 }
 
 static void
-gsd_sound_manager_finalize (GObject *object)
+msd_sound_manager_finalize (GObject *object)
 {
-        GsdSoundManager *sound_manager;
+        MsdSoundManager *sound_manager;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_SOUND_MANAGER (object));
+        g_return_if_fail (MSD_IS_SOUND_MANAGER (object));
 
-        sound_manager = GSD_SOUND_MANAGER (object);
+        sound_manager = MSD_SOUND_MANAGER (object);
 
         g_return_if_fail (sound_manager->priv);
 
-        G_OBJECT_CLASS (gsd_sound_manager_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_sound_manager_parent_class)->finalize (object);
 }
 
-GsdSoundManager *
-gsd_sound_manager_new (void)
+MsdSoundManager *
+msd_sound_manager_new (void)
 {
         if (manager_object) {
                 g_object_ref (manager_object);
         } else {
-                manager_object = g_object_new (GSD_TYPE_SOUND_MANAGER, NULL);
+                manager_object = g_object_new (MSD_TYPE_SOUND_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object, (gpointer *) &manager_object);
         }
 
-        return GSD_SOUND_MANAGER (manager_object);
+        return MSD_SOUND_MANAGER (manager_object);
 }
diff --git a/plugins/sound/gsd-sound-manager.h b/plugins/sound/msd-sound-manager.h
index e640f09..ee4f6f5 100644
--- a/plugins/sound/gsd-sound-manager.h
+++ b/plugins/sound/msd-sound-manager.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_SOUND_MANAGER_H
-#define __GSD_SOUND_MANAGER_H
+#ifndef __MSD_SOUND_MANAGER_H
+#define __MSD_SOUND_MANAGER_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -28,34 +28,34 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_SOUND_MANAGER         (gsd_sound_manager_get_type ())
-#define GSD_SOUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_SOUND_MANAGER, GsdSoundManager))
-#define GSD_SOUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GSD_TYPE_SOUND_MANAGER, GsdSoundManagerClass))
-#define GSD_IS_SOUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_SOUND_MANAGER))
-#define GSD_IS_SOUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_SOUND_MANAGER))
-#define GSD_SOUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_SOUND_MANAGER, GsdSoundManagerClass))
+#define MSD_TYPE_SOUND_MANAGER         (msd_sound_manager_get_type ())
+#define MSD_SOUND_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_SOUND_MANAGER, MsdSoundManager))
+#define MSD_SOUND_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), MSD_TYPE_SOUND_MANAGER, MsdSoundManagerClass))
+#define MSD_IS_SOUND_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_SOUND_MANAGER))
+#define MSD_IS_SOUND_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_SOUND_MANAGER))
+#define MSD_SOUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_SOUND_MANAGER, MsdSoundManagerClass))
 
-typedef struct GsdSoundManagerPrivate GsdSoundManagerPrivate;
+typedef struct MsdSoundManagerPrivate MsdSoundManagerPrivate;
 
 typedef struct
 {
         GObject parent;
-        GsdSoundManagerPrivate *priv;
-} GsdSoundManager;
+        MsdSoundManagerPrivate *priv;
+} MsdSoundManager;
 
 typedef struct
 {
         GObjectClass parent_class;
-} GsdSoundManagerClass;
+} MsdSoundManagerClass;
 
-GType gsd_sound_manager_get_type (void) G_GNUC_CONST;
+GType msd_sound_manager_get_type (void) G_GNUC_CONST;
 
-GsdSoundManager *gsd_sound_manager_new (void);
-gboolean gsd_sound_manager_start (GsdSoundManager *manager, GError **error);
-void gsd_sound_manager_stop (GsdSoundManager *manager);
+MsdSoundManager *msd_sound_manager_new (void);
+gboolean msd_sound_manager_start (MsdSoundManager *manager, GError **error);
+void msd_sound_manager_stop (MsdSoundManager *manager);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_SOUND_MANAGER_H */
+#endif /* __MSD_SOUND_MANAGER_H */
diff --git a/plugins/sound/gsd-sound-plugin.c b/plugins/sound/msd-sound-plugin.c
index 88168bf..28a2c85 100644
--- a/plugins/sound/gsd-sound-plugin.c
+++ b/plugins/sound/msd-sound-plugin.c
@@ -24,45 +24,45 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-sound-plugin.h"
-#include "gsd-sound-manager.h"
+#include "msd-sound-plugin.h"
+#include "msd-sound-manager.h"
 
-struct GsdSoundPluginPrivate {
-        GsdSoundManager *manager;
+struct MsdSoundPluginPrivate {
+        MsdSoundManager *manager;
 };
 
-#define GSD_SOUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_SOUND_PLUGIN, GsdSoundPluginPrivate))
+#define MSD_SOUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_SOUND_PLUGIN, MsdSoundPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdSoundPlugin, gsd_sound_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdSoundPlugin, msd_sound_plugin)
 
 static void
-gsd_sound_plugin_init (GsdSoundPlugin *plugin)
+msd_sound_plugin_init (MsdSoundPlugin *plugin)
 {
-        plugin->priv = GSD_SOUND_PLUGIN_GET_PRIVATE (plugin);
+        plugin->priv = MSD_SOUND_PLUGIN_GET_PRIVATE (plugin);
 
-        g_debug ("GsdSoundPlugin initializing");
+        g_debug ("MsdSoundPlugin initializing");
 
-        plugin->priv->manager = gsd_sound_manager_new ();
+        plugin->priv->manager = msd_sound_manager_new ();
 }
 
 static void
-gsd_sound_plugin_finalize (GObject *object)
+msd_sound_plugin_finalize (GObject *object)
 {
-        GsdSoundPlugin *plugin;
+        MsdSoundPlugin *plugin;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (GSD_IS_SOUND_PLUGIN (object));
+        g_return_if_fail (MSD_IS_SOUND_PLUGIN (object));
 
-        g_debug ("GsdSoundPlugin finalizing");
+        g_debug ("MsdSoundPlugin finalizing");
 
-        plugin = GSD_SOUND_PLUGIN (object);
+        plugin = MSD_SOUND_PLUGIN (object);
 
         g_return_if_fail (plugin->priv != NULL);
 
         if (plugin->priv->manager != NULL)
                 g_object_unref (plugin->priv->manager);
 
-        G_OBJECT_CLASS (gsd_sound_plugin_parent_class)->finalize (object);
+        G_OBJECT_CLASS (msd_sound_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -72,7 +72,7 @@ impl_activate (MateSettingsPlugin *plugin)
 
         g_debug ("Activating sound plugin");
 
-        if (!gsd_sound_manager_start (GSD_SOUND_PLUGIN (plugin)->priv->manager, &error)) {
+        if (!msd_sound_manager_start (MSD_SOUND_PLUGIN (plugin)->priv->manager, &error)) {
                 g_warning ("Unable to start sound manager: %s", error->message);
                 g_error_free (error);
         }
@@ -82,19 +82,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
         g_debug ("Deactivating sound plugin");
-        gsd_sound_manager_stop (GSD_SOUND_PLUGIN (plugin)->priv->manager);
+        msd_sound_manager_stop (MSD_SOUND_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_sound_plugin_class_init (GsdSoundPluginClass *klass)
+msd_sound_plugin_class_init (MsdSoundPluginClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
         MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
-        object_class->finalize = gsd_sound_plugin_finalize;
+        object_class->finalize = msd_sound_plugin_finalize;
 
         plugin_class->activate = impl_activate;
         plugin_class->deactivate = impl_deactivate;
 
-        g_type_class_add_private (klass, sizeof (GsdSoundPluginPrivate));
+        g_type_class_add_private (klass, sizeof (MsdSoundPluginPrivate));
 }
diff --git a/plugins/sound/gsd-sound-plugin.h b/plugins/sound/msd-sound-plugin.h
index 660e159..b1dac8a 100644
--- a/plugins/sound/gsd-sound-plugin.h
+++ b/plugins/sound/msd-sound-plugin.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __GSD_SOUND_PLUGIN_H__
-#define __GSD_SOUND_PLUGIN_H__
+#ifndef __MSD_SOUND_PLUGIN_H__
+#define __MSD_SOUND_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_SOUND_PLUGIN                (gsd_sound_plugin_get_type ())
-#define GSD_SOUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_SOUND_PLUGIN, GsdSoundPlugin))
-#define GSD_SOUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST ((k), GSD_TYPE_SOUND_PLUGIN, GsdSoundPluginClass))
-#define GSD_IS_SOUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_SOUND_PLUGIN))
-#define GSD_IS_SOUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_SOUND_PLUGIN))
-#define GSD_SOUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_SOUND_PLUGIN, GsdSoundPluginClass))
+#define MSD_TYPE_SOUND_PLUGIN                (msd_sound_plugin_get_type ())
+#define MSD_SOUND_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_SOUND_PLUGIN, MsdSoundPlugin))
+#define MSD_SOUND_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST ((k), MSD_TYPE_SOUND_PLUGIN, MsdSoundPluginClass))
+#define MSD_IS_SOUND_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_SOUND_PLUGIN))
+#define MSD_IS_SOUND_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_SOUND_PLUGIN))
+#define MSD_SOUND_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_SOUND_PLUGIN, MsdSoundPluginClass))
 
-typedef struct GsdSoundPluginPrivate GsdSoundPluginPrivate;
+typedef struct MsdSoundPluginPrivate MsdSoundPluginPrivate;
 
 typedef struct
 {
         MateSettingsPlugin parent;
-        GsdSoundPluginPrivate *priv;
-} GsdSoundPlugin;
+        MsdSoundPluginPrivate *priv;
+} MsdSoundPlugin;
 
 typedef struct
 {
         MateSettingsPluginClass parent_class;
-} GsdSoundPluginClass;
+} MsdSoundPluginClass;
 
-GType gsd_sound_plugin_get_type (void) G_GNUC_CONST;
+GType msd_sound_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_SOUND_PLUGIN_H__ */
+#endif /* __MSD_SOUND_PLUGIN_H__ */