5 files changed, 84 insertions, 84 deletions
diff --git a/plugins/font/Makefile.am b/plugins/font/Makefile.am
index 99dff34..d0cf9ce 100644
--- a/plugins/font/Makefile.am
+++ b/plugins/font/Makefile.am
@@ -5,10 +5,10 @@ plugin_LTLIBRARIES = \
 $(NULL)
 
 libfont_la_SOURCES = \
- gsd-font-plugin.h \
- gsd-font-plugin.c \
- gsd-font-manager.h \
- gsd-font-manager.c \
+ msd-font-plugin.h \
+ msd-font-plugin.c \
+ msd-font-manager.h \
+ msd-font-manager.c \
 delayed-dialog.h \
 delayed-dialog.c \
 $(NULL)
@@ -23,7 +23,7 @@ libfont_la_CFLAGS = \
 $(AM_CFLAGS)
 
 libfont_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS) \
+ $(MSD_PLUGIN_LDFLAGS) \
 $(NULL)
 
 libfont_la_LIBADD = \
@@ -48,4 +48,4 @@ DISTCLEANFILES = \
 $(plugin_DATA) \
 $(NULL)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/font/gsd-font-manager.c b/plugins/font/gsd-font-manager.c
index 3db06ce..bcae037 100644
--- a/plugins/font/gsd-font-manager.c
+++ b/plugins/font/gsd-font-manager.c
@@ -44,13 +44,13 @@
 #include <mateconf/mateconf-client.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-font-manager.h"
+#include "msd-font-manager.h"
 #include "delayed-dialog.h"
 
-static void gsd_font_manager_class_init (GsdFontManagerClass *klass);
-static void gsd_font_manager_init (GsdFontManager *font_manager);
+static void msd_font_manager_class_init (MsdFontManagerClass *klass);
+static void msd_font_manager_init (MsdFontManager *font_manager);
 
-G_DEFINE_TYPE (GsdFontManager, gsd_font_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdFontManager, msd_font_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
@@ -338,7 +338,7 @@ done:
 }
 
 gboolean
-gsd_font_manager_start (GsdFontManager *manager,
+msd_font_manager_start (MsdFontManager *manager,
 GError **error)
 {
 MateConfClient *client;
@@ -359,20 +359,20 @@ gsd_font_manager_start (GsdFontManager *manager,
 }
 
 void
-gsd_font_manager_stop (GsdFontManager *manager)
+msd_font_manager_stop (MsdFontManager *manager)
 {
 g_debug ("Stopping font manager");
 }
 
 static void
-gsd_font_manager_set_property (GObject *object,
+msd_font_manager_set_property (GObject *object,
 guint prop_id,
 const GValue *value,
 GParamSpec *pspec)
 {
- GsdFontManager *self;
+ MsdFontManager *self;
 
- self = GSD_FONT_MANAGER (object);
+ self = MSD_FONT_MANAGER (object);
 
 switch (prop_id) {
 default:
@@ -382,14 +382,14 @@ gsd_font_manager_set_property (GObject *object,
 }
 
 static void
-gsd_font_manager_get_property (GObject *object,
+msd_font_manager_get_property (GObject *object,
 guint prop_id,
 GValue *value,
 GParamSpec *pspec)
 {
- GsdFontManager *self;
+ MsdFontManager *self;
 
- self = GSD_FONT_MANAGER (object);
+ self = MSD_FONT_MANAGER (object);
 
 switch (prop_id) {
 default:
@@ -399,16 +399,16 @@ gsd_font_manager_get_property (GObject *object,
 }
 
 static GObject *
-gsd_font_manager_constructor (GType type,
+msd_font_manager_constructor (GType type,
 guint n_construct_properties,
 GObjectConstructParam *construct_properties)
 {
- GsdFontManager *font_manager;
- GsdFontManagerClass *klass;
+ MsdFontManager *font_manager;
+ MsdFontManagerClass *klass;
 
- klass = GSD_FONT_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_FONT_MANAGER));
+ klass = MSD_FONT_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_FONT_MANAGER));
 
- font_manager = GSD_FONT_MANAGER (G_OBJECT_CLASS (gsd_font_manager_parent_class)->constructor (type,
+ font_manager = MSD_FONT_MANAGER (G_OBJECT_CLASS (msd_font_manager_parent_class)->constructor (type,
 n_construct_properties,
 construct_properties));
 
@@ -416,30 +416,30 @@ gsd_font_manager_constructor (GType type,
 }
 
 static void
-gsd_font_manager_class_init (GsdFontManagerClass *klass)
+msd_font_manager_class_init (MsdFontManagerClass *klass)
 {
 GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
- object_class->get_property = gsd_font_manager_get_property;
- object_class->set_property = gsd_font_manager_set_property;
- object_class->constructor = gsd_font_manager_constructor;
+ object_class->get_property = msd_font_manager_get_property;
+ object_class->set_property = msd_font_manager_set_property;
+ object_class->constructor = msd_font_manager_constructor;
 }
 
 static void
-gsd_font_manager_init (GsdFontManager *manager)
+msd_font_manager_init (MsdFontManager *manager)
 {
 }
 
-GsdFontManager *
-gsd_font_manager_new (void)
+MsdFontManager *
+msd_font_manager_new (void)
 {
 if (manager_object != NULL) {
 g_object_ref (manager_object);
 } else {
- manager_object = g_object_new (GSD_TYPE_FONT_MANAGER, NULL);
+ manager_object = g_object_new (MSD_TYPE_FONT_MANAGER, NULL);
 g_object_add_weak_pointer (manager_object,
 (gpointer *) &manager_object);
 }
 
- return GSD_FONT_MANAGER (manager_object);
+ return MSD_FONT_MANAGER (manager_object);
 }
diff --git a/plugins/font/gsd-font-manager.h b/plugins/font/gsd-font-manager.h
index be53d98..3709d0f 100644
--- a/plugins/font/gsd-font-manager.h
+++ b/plugins/font/gsd-font-manager.h
@@ -18,8 +18,8 @@
 *
 */
 
-#ifndef __GSD_FONT_MANAGER_H
-#define __GSD_FONT_MANAGER_H
+#ifndef __MSD_FONT_MANAGER_H
+#define __MSD_FONT_MANAGER_H
 
 #include <glib-object.h>
 
@@ -27,35 +27,35 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_FONT_MANAGER (gsd_font_manager_get_type ())
-#define GSD_FONT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_FONT_MANAGER, GsdFontManager))
-#define GSD_FONT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_FONT_MANAGER, GsdFontManagerClass))
-#define GSD_IS_FONT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_FONT_MANAGER))
-#define GSD_IS_FONT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_FONT_MANAGER))
-#define GSD_FONT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_FONT_MANAGER, GsdFontManagerClass))
+#define MSD_TYPE_FONT_MANAGER (msd_font_manager_get_type ())
+#define MSD_FONT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_FONT_MANAGER, MsdFontManager))
+#define MSD_FONT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_FONT_MANAGER, MsdFontManagerClass))
+#define MSD_IS_FONT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_FONT_MANAGER))
+#define MSD_IS_FONT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_FONT_MANAGER))
+#define MSD_FONT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_FONT_MANAGER, MsdFontManagerClass))
 
-typedef struct GsdFontManagerPrivate GsdFontManagerPrivate;
+typedef struct MsdFontManagerPrivate MsdFontManagerPrivate;
 
 typedef struct
 {
 GObject parent;
- GsdFontManagerPrivate *priv;
-} GsdFontManager;
+ MsdFontManagerPrivate *priv;
+} MsdFontManager;
 
 typedef struct
 {
 GObjectClass parent_class;
-} GsdFontManagerClass;
+} MsdFontManagerClass;
 
-GType gsd_font_manager_get_type (void);
+GType msd_font_manager_get_type (void);
 
-GsdFontManager * gsd_font_manager_new (void);
-gboolean gsd_font_manager_start (GsdFontManager *manager,
+MsdFontManager * msd_font_manager_new (void);
+gboolean msd_font_manager_start (MsdFontManager *manager,
 GError **error);
-void gsd_font_manager_stop (GsdFontManager *manager);
+void msd_font_manager_stop (MsdFontManager *manager);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_FONT_MANAGER_H */
+#endif /* __MSD_FONT_MANAGER_H */
diff --git a/plugins/font/gsd-font-plugin.c b/plugins/font/gsd-font-plugin.c
index dc34c6b..7711e19 100644
--- a/plugins/font/gsd-font-plugin.c
+++ b/plugins/font/gsd-font-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-font-plugin.h"
-#include "gsd-font-manager.h"
+#include "msd-font-plugin.h"
+#include "msd-font-manager.h"
 
-struct GsdFontPluginPrivate {
- GsdFontManager *manager;
+struct MsdFontPluginPrivate {
+ MsdFontManager *manager;
 };
 
-#define GSD_FONT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_FONT_PLUGIN, GsdFontPluginPrivate))
+#define MSD_FONT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_FONT_PLUGIN, MsdFontPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdFontPlugin, gsd_font_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdFontPlugin, msd_font_plugin)
 
 static void
-gsd_font_plugin_init (GsdFontPlugin *plugin)
+msd_font_plugin_init (MsdFontPlugin *plugin)
 {
- plugin->priv = GSD_FONT_PLUGIN_GET_PRIVATE (plugin);
+ plugin->priv = MSD_FONT_PLUGIN_GET_PRIVATE (plugin);
 
- g_debug ("GsdFontPlugin initializing");
+ g_debug ("MsdFontPlugin initializing");
 
- plugin->priv->manager = gsd_font_manager_new ();
+ plugin->priv->manager = msd_font_manager_new ();
 }
 
 static void
-gsd_font_plugin_finalize (GObject *object)
+msd_font_plugin_finalize (GObject *object)
 {
- GsdFontPlugin *plugin;
+ MsdFontPlugin *plugin;
 
 g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_FONT_PLUGIN (object));
+ g_return_if_fail (MSD_IS_FONT_PLUGIN (object));
 
- g_debug ("GsdFontPlugin finalizing");
+ g_debug ("MsdFontPlugin finalizing");
 
- plugin = GSD_FONT_PLUGIN (object);
+ plugin = MSD_FONT_PLUGIN (object);
 
 g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_font_plugin_finalize (GObject *object)
 g_object_unref (plugin->priv->manager);
 }
 
- G_OBJECT_CLASS (gsd_font_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_font_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
 g_debug ("Activating font plugin");
 
 error = NULL;
- res = gsd_font_manager_start (GSD_FONT_PLUGIN (plugin)->priv->manager, &error);
+ res = msd_font_manager_start (MSD_FONT_PLUGIN (plugin)->priv->manager, &error);
 if (! res) {
 g_warning ("Unable to start font manager: %s", error->message);
 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
 g_debug ("Deactivating font plugin");
- gsd_font_manager_stop (GSD_FONT_PLUGIN (plugin)->priv->manager);
+ msd_font_manager_stop (MSD_FONT_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_font_plugin_class_init (GsdFontPluginClass *klass)
+msd_font_plugin_class_init (MsdFontPluginClass *klass)
 {
 GObjectClass *object_class = G_OBJECT_CLASS (klass);
 MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
- object_class->finalize = gsd_font_plugin_finalize;
+ object_class->finalize = msd_font_plugin_finalize;
 
 plugin_class->activate = impl_activate;
 plugin_class->deactivate = impl_deactivate;
 
- g_type_class_add_private (klass, sizeof (GsdFontPluginPrivate));
+ g_type_class_add_private (klass, sizeof (MsdFontPluginPrivate));
 }
diff --git a/plugins/font/gsd-font-plugin.h b/plugins/font/gsd-font-plugin.h
index 06dd2be..9865412 100644
--- a/plugins/font/gsd-font-plugin.h
+++ b/plugins/font/gsd-font-plugin.h
@@ -18,8 +18,8 @@
 *
 */
 
-#ifndef __GSD_FONT_PLUGIN_H__
-#define __GSD_FONT_PLUGIN_H__
+#ifndef __MSD_FONT_PLUGIN_H__
+#define __MSD_FONT_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_FONT_PLUGIN (gsd_font_plugin_get_type ())
-#define GSD_FONT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_FONT_PLUGIN, GsdFontPlugin))
-#define GSD_FONT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_FONT_PLUGIN, GsdFontPluginClass))
-#define GSD_IS_FONT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_FONT_PLUGIN))
-#define GSD_IS_FONT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_FONT_PLUGIN))
-#define GSD_FONT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_FONT_PLUGIN, GsdFontPluginClass))
+#define MSD_TYPE_FONT_PLUGIN (msd_font_plugin_get_type ())
+#define MSD_FONT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_FONT_PLUGIN, MsdFontPlugin))
+#define MSD_FONT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_FONT_PLUGIN, MsdFontPluginClass))
+#define MSD_IS_FONT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_FONT_PLUGIN))
+#define MSD_IS_FONT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_FONT_PLUGIN))
+#define MSD_FONT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_FONT_PLUGIN, MsdFontPluginClass))
 
-typedef struct GsdFontPluginPrivate GsdFontPluginPrivate;
+typedef struct MsdFontPluginPrivate MsdFontPluginPrivate;
 
 typedef struct
 {
 MateSettingsPlugin parent;
- GsdFontPluginPrivate *priv;
-} GsdFontPlugin;
+ MsdFontPluginPrivate *priv;
+} MsdFontPlugin;
 
 typedef struct
 {
 MateSettingsPluginClass parent_class;
-} GsdFontPluginClass;
+} MsdFontPluginClass;
 
-GType gsd_font_plugin_get_type (void) G_GNUC_CONST;
+GType msd_font_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_FONT_PLUGIN_H__ */
+#endif /* __MSD_FONT_PLUGIN_H__ */