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

author: haxar <[email protected]> 2012-02-21 20:13:04 -0800
committer: haxar <[email protected]> 2012-02-21 20:13:04 -0800
commit: ddaceb232c8b537a7d29a9708928d3a3671b98e5 (patch)
tree: d874e557f2999f9550ad2b710f0231ed06f50ba8 /plugins/background
parent: ecd8a153901507f5d210d6f85103693ef81d49c3 (diff)
download: mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.bz2
mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.xz
6 files changed, 121 insertions, 121 deletions
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index f773144..a047573 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -6,8 +6,8 @@ noinst_PROGRAMS = \
 
 test_background_SOURCES = \
 test-background.c \
- gsd-background-manager.h \
- gsd-background-manager.c \
+ msd-background-manager.h \
+ msd-background-manager.c \
 $(NULL)
 
 test_background_CPPFLAGS = \
@@ -20,7 +20,7 @@ test_background_CFLAGS = \
 $(AM_CFLAGS)
 
 test_background_LDADD = \
- $(top_builddir)/mate-settings-daemon/libgsd-profile.la \
+ $(top_builddir)/mate-settings-daemon/libmsd-profile.la \
 $(SETTINGS_PLUGIN_LIBS) \
 $(X11_LIBS) \
 $(NULL)
@@ -30,10 +30,10 @@ plugin_LTLIBRARIES = \
 $(NULL)
 
 libbackground_la_SOURCES = \
- gsd-background-plugin.h \
- gsd-background-plugin.c \
- gsd-background-manager.h \
- gsd-background-manager.c \
+ msd-background-plugin.h \
+ msd-background-plugin.c \
+ msd-background-manager.h \
+ msd-background-manager.c \
 $(NULL)
 
 libbackground_la_CPPFLAGS = \
@@ -47,7 +47,7 @@ libbackground_la_CFLAGS = \
 $(AM_CFLAGS)
 
 libbackground_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS) \
+ $(MSD_PLUGIN_LDFLAGS) \
 $(NULL)
 
 libbackground_la_LIBADD = \
@@ -72,4 +72,4 @@ DISTCLEANFILES = \
 $(plugin_DATA) \
 $(NULL)
 
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
index c05ec3f..25ab7ec 100644
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -45,13 +45,13 @@
 #include <X11/Xatom.h>
 
 #include "mate-settings-profile.h"
-#include "gsd-background-manager.h"
+#include "msd-background-manager.h"
 
 #define CAJA_SHOW_DESKTOP_KEY "/apps/caja/preferences/show_desktop"
 
-#define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate))
+#define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate))
 
-struct GsdBackgroundManagerPrivate
+struct MsdBackgroundManagerPrivate
 {
 MateConfClient *client;
 MateBG *bg;
@@ -61,11 +61,11 @@ struct GsdBackgroundManagerPrivate
 DBusConnection *dbus_connection;
 };
 
-static void gsd_background_manager_class_init (GsdBackgroundManagerClass *klass);
-static void gsd_background_manager_init (GsdBackgroundManager *background_manager);
-static void gsd_background_manager_finalize (GObject *object);
+static void msd_background_manager_class_init (MsdBackgroundManagerClass *klass);
+static void msd_background_manager_init (MsdBackgroundManager *background_manager);
+static void msd_background_manager_finalize (GObject *object);
 
-G_DEFINE_TYPE (GsdBackgroundManager, gsd_background_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT)
 
 static gpointer manager_object = NULL;
 
@@ -161,7 +161,7 @@ caja_is_running (void)
 }
 
 static void
-draw_background (GsdBackgroundManager *manager,
+draw_background (MsdBackgroundManager *manager,
 gboolean use_crossfade)
 {
 GdkDisplay *display;
@@ -210,14 +210,14 @@ draw_background (GsdBackgroundManager *manager,
 
 static void
 on_bg_changed (MateBG *bg,
- GsdBackgroundManager *manager)
+ MsdBackgroundManager *manager)
 {
 draw_background (manager, TRUE);
 }
 
 static void
 on_bg_transitioned (MateBG *bg,
- GsdBackgroundManager *manager)
+ MsdBackgroundManager *manager)
 {
 draw_background (manager, FALSE);
 }
@@ -226,14 +226,14 @@ static void
 mateconf_changed_callback (MateConfClient *client,
 guint cnxn_id,
 MateConfEntry *entry,
- GsdBackgroundManager *manager)
+ MsdBackgroundManager *manager)
 {
 mate_bg_load_from_preferences (manager->priv->bg,
 manager->priv->client);
 }
 
 static void
-watch_bg_preferences (GsdBackgroundManager *manager)
+watch_bg_preferences (MsdBackgroundManager *manager)
 {
 g_assert (manager->priv->bg_notify_id == 0);
 
@@ -250,7 +250,7 @@ watch_bg_preferences (GsdBackgroundManager *manager)
 }
 
 static void
-setup_bg (GsdBackgroundManager *manager)
+setup_bg (MsdBackgroundManager *manager)
 {
 g_return_if_fail (manager->priv->bg == NULL);
 
@@ -272,7 +272,7 @@ setup_bg (GsdBackgroundManager *manager)
 }
 
 static gboolean
-queue_draw_background (GsdBackgroundManager *manager)
+queue_draw_background (MsdBackgroundManager *manager)
 {
 manager->priv->timeout_id = 0;
 if (caja_is_running ()) {
@@ -288,7 +288,7 @@ on_bus_message (DBusConnection *connection,
 DBusMessage *message,
 void *user_data)
 {
- GsdBackgroundManager *manager = user_data;
+ MsdBackgroundManager *manager = user_data;
 
 if (dbus_message_is_signal (message,
 "org.mate.SessionManager",
@@ -315,7 +315,7 @@ on_bus_message (DBusConnection *connection,
 }
 
 static void
-draw_background_after_session_loads (GsdBackgroundManager *manager)
+draw_background_after_session_loads (MsdBackgroundManager *manager)
 {
 DBusConnection *connection;
 
@@ -334,7 +334,7 @@ draw_background_after_session_loads (GsdBackgroundManager *manager)
 
 static void
 on_screen_size_changed (GdkScreen *screen,
- GsdBackgroundManager *manager)
+ MsdBackgroundManager *manager)
 {
 gboolean caja_show_desktop;
 
@@ -351,7 +351,7 @@ on_screen_size_changed (GdkScreen *screen,
 }
 
 static void
-disconnect_screen_signals (GsdBackgroundManager *manager)
+disconnect_screen_signals (MsdBackgroundManager *manager)
 {
 GdkDisplay *display;
 int i;
@@ -370,7 +370,7 @@ disconnect_screen_signals (GsdBackgroundManager *manager)
 }
 
 static void
-connect_screen_signals (GsdBackgroundManager *manager)
+connect_screen_signals (MsdBackgroundManager *manager)
 {
 GdkDisplay *display;
 int i;
@@ -394,7 +394,7 @@ connect_screen_signals (GsdBackgroundManager *manager)
 }
 
 gboolean
-gsd_background_manager_start (GsdBackgroundManager *manager,
+msd_background_manager_start (MsdBackgroundManager *manager,
 GError **error)
 {
 gboolean caja_show_desktop;
@@ -429,9 +429,9 @@ gsd_background_manager_start (GsdBackgroundManager *manager,
 }
 
 void
-gsd_background_manager_stop (GsdBackgroundManager *manager)
+msd_background_manager_stop (MsdBackgroundManager *manager)
 {
- GsdBackgroundManagerPrivate *p = manager->priv;
+ MsdBackgroundManagerPrivate *p = manager->priv;
 
 g_debug ("Stopping background manager");
 
@@ -469,14 +469,14 @@ gsd_background_manager_stop (GsdBackgroundManager *manager)
 }
 
 static void
-gsd_background_manager_set_property (GObject *object,
+msd_background_manager_set_property (GObject *object,
 guint prop_id,
 const GValue *value,
 GParamSpec *pspec)
 {
- GsdBackgroundManager *self;
+ MsdBackgroundManager *self;
 
- self = GSD_BACKGROUND_MANAGER (object);
+ self = MSD_BACKGROUND_MANAGER (object);
 
 switch (prop_id) {
 default:
@@ -486,14 +486,14 @@ gsd_background_manager_set_property (GObject *object,
 }
 
 static void
-gsd_background_manager_get_property (GObject *object,
+msd_background_manager_get_property (GObject *object,
 guint prop_id,
 GValue *value,
 GParamSpec *pspec)
 {
- GsdBackgroundManager *self;
+ MsdBackgroundManager *self;
 
- self = GSD_BACKGROUND_MANAGER (object);
+ self = MSD_BACKGROUND_MANAGER (object);
 
 switch (prop_id) {
 default:
@@ -503,16 +503,16 @@ gsd_background_manager_get_property (GObject *object,
 }
 
 static GObject *
-gsd_background_manager_constructor (GType type,
+msd_background_manager_constructor (GType type,
 guint n_construct_properties,
 GObjectConstructParam *construct_properties)
 {
- GsdBackgroundManager *background_manager;
- GsdBackgroundManagerClass *klass;
+ MsdBackgroundManager *background_manager;
+ MsdBackgroundManagerClass *klass;
 
- klass = GSD_BACKGROUND_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_BACKGROUND_MANAGER));
+ klass = MSD_BACKGROUND_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_BACKGROUND_MANAGER));
 
- background_manager = GSD_BACKGROUND_MANAGER (G_OBJECT_CLASS (gsd_background_manager_parent_class)->constructor (type,
+ background_manager = MSD_BACKGROUND_MANAGER (G_OBJECT_CLASS (msd_background_manager_parent_class)->constructor (type,
 n_construct_properties,
 construct_properties));
 
@@ -520,60 +520,60 @@ gsd_background_manager_constructor (GType type,
 }
 
 static void
-gsd_background_manager_dispose (GObject *object)
+msd_background_manager_dispose (GObject *object)
 {
- GsdBackgroundManager *background_manager;
+ MsdBackgroundManager *background_manager;
 
- background_manager = GSD_BACKGROUND_MANAGER (object);
+ background_manager = MSD_BACKGROUND_MANAGER (object);
 
- G_OBJECT_CLASS (gsd_background_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (msd_background_manager_parent_class)->dispose (object);
 }
 
 static void
-gsd_background_manager_class_init (GsdBackgroundManagerClass *klass)
+msd_background_manager_class_init (MsdBackgroundManagerClass *klass)
 {
 GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
- object_class->get_property = gsd_background_manager_get_property;
- object_class->set_property = gsd_background_manager_set_property;
- object_class->constructor = gsd_background_manager_constructor;
- object_class->dispose = gsd_background_manager_dispose;
- object_class->finalize = gsd_background_manager_finalize;
+ object_class->get_property = msd_background_manager_get_property;
+ object_class->set_property = msd_background_manager_set_property;
+ object_class->constructor = msd_background_manager_constructor;
+ object_class->dispose = msd_background_manager_dispose;
+ object_class->finalize = msd_background_manager_finalize;
 
- g_type_class_add_private (klass, sizeof (GsdBackgroundManagerPrivate));
+ g_type_class_add_private (klass, sizeof (MsdBackgroundManagerPrivate));
 }
 
 static void
-gsd_background_manager_init (GsdBackgroundManager *manager)
+msd_background_manager_init (MsdBackgroundManager *manager)
 {
- manager->priv = GSD_BACKGROUND_MANAGER_GET_PRIVATE (manager);
+ manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE (manager);
 }
 
 static void
-gsd_background_manager_finalize (GObject *object)
+msd_background_manager_finalize (GObject *object)
 {
- GsdBackgroundManager *background_manager;
+ MsdBackgroundManager *background_manager;
 
 g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_BACKGROUND_MANAGER (object));
+ g_return_if_fail (MSD_IS_BACKGROUND_MANAGER (object));
 
- background_manager = GSD_BACKGROUND_MANAGER (object);
+ background_manager = MSD_BACKGROUND_MANAGER (object);
 
 g_return_if_fail (background_manager->priv != NULL);
 
- G_OBJECT_CLASS (gsd_background_manager_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_background_manager_parent_class)->finalize (object);
 }
 
-GsdBackgroundManager *
-gsd_background_manager_new (void)
+MsdBackgroundManager *
+msd_background_manager_new (void)
 {
 if (manager_object != NULL) {
 g_object_ref (manager_object);
 } else {
- manager_object = g_object_new (GSD_TYPE_BACKGROUND_MANAGER, NULL);
+ manager_object = g_object_new (MSD_TYPE_BACKGROUND_MANAGER, NULL);
 g_object_add_weak_pointer (manager_object,
 (gpointer *) &manager_object);
 }
 
- return GSD_BACKGROUND_MANAGER (manager_object);
+ return MSD_BACKGROUND_MANAGER (manager_object);
 }
diff --git a/plugins/background/gsd-background-manager.h b/plugins/background/gsd-background-manager.h
index 27c900a..91e232c 100644
--- a/plugins/background/gsd-background-manager.h
+++ b/plugins/background/gsd-background-manager.h
@@ -18,8 +18,8 @@
 *
 */
 
-#ifndef __GSD_BACKGROUND_MANAGER_H
-#define __GSD_BACKGROUND_MANAGER_H
+#ifndef __MSD_BACKGROUND_MANAGER_H
+#define __MSD_BACKGROUND_MANAGER_H
 
 #include <glib-object.h>
 
@@ -27,35 +27,35 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_BACKGROUND_MANAGER (gsd_background_manager_get_type ())
-#define GSD_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManager))
-#define GSD_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerClass))
-#define GSD_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_MANAGER))
-#define GSD_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_MANAGER))
-#define GSD_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerClass))
+#define MSD_TYPE_BACKGROUND_MANAGER (msd_background_manager_get_type ())
+#define MSD_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManager))
+#define MSD_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass))
+#define MSD_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_BACKGROUND_MANAGER))
+#define MSD_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_BACKGROUND_MANAGER))
+#define MSD_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass))
 
-typedef struct GsdBackgroundManagerPrivate GsdBackgroundManagerPrivate;
+typedef struct MsdBackgroundManagerPrivate MsdBackgroundManagerPrivate;
 
 typedef struct
 {
 GObject parent;
- GsdBackgroundManagerPrivate *priv;
-} GsdBackgroundManager;
+ MsdBackgroundManagerPrivate *priv;
+} MsdBackgroundManager;
 
 typedef struct
 {
 GObjectClass parent_class;
-} GsdBackgroundManagerClass;
+} MsdBackgroundManagerClass;
 
-GType gsd_background_manager_get_type (void);
+GType msd_background_manager_get_type (void);
 
-GsdBackgroundManager * gsd_background_manager_new (void);
-gboolean gsd_background_manager_start (GsdBackgroundManager *manager,
+MsdBackgroundManager * msd_background_manager_new (void);
+gboolean msd_background_manager_start (MsdBackgroundManager *manager,
 GError **error);
-void gsd_background_manager_stop (GsdBackgroundManager *manager);
+void msd_background_manager_stop (MsdBackgroundManager *manager);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __GSD_BACKGROUND_MANAGER_H */
+#endif /* __MSD_BACKGROUND_MANAGER_H */
diff --git a/plugins/background/gsd-background-plugin.c b/plugins/background/gsd-background-plugin.c
index e001f39..d12bb2b 100644
--- a/plugins/background/gsd-background-plugin.c
+++ b/plugins/background/gsd-background-plugin.c
@@ -24,38 +24,38 @@
 #include <gmodule.h>
 
 #include "mate-settings-plugin.h"
-#include "gsd-background-plugin.h"
-#include "gsd-background-manager.h"
+#include "msd-background-plugin.h"
+#include "msd-background-manager.h"
 
-struct GsdBackgroundPluginPrivate {
- GsdBackgroundManager *manager;
+struct MsdBackgroundPluginPrivate {
+ MsdBackgroundManager *manager;
 };
 
-#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate))
+#define MSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginPrivate))
 
-MATE_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdBackgroundPlugin, msd_background_plugin)
 
 static void
-gsd_background_plugin_init (GsdBackgroundPlugin *plugin)
+msd_background_plugin_init (MsdBackgroundPlugin *plugin)
 {
- plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
+ plugin->priv = MSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin);
 
- g_debug ("GsdBackgroundPlugin initializing");
+ g_debug ("MsdBackgroundPlugin initializing");
 
- plugin->priv->manager = gsd_background_manager_new ();
+ plugin->priv->manager = msd_background_manager_new ();
 }
 
 static void
-gsd_background_plugin_finalize (GObject *object)
+msd_background_plugin_finalize (GObject *object)
 {
- GsdBackgroundPlugin *plugin;
+ MsdBackgroundPlugin *plugin;
 
 g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object));
+ g_return_if_fail (MSD_IS_BACKGROUND_PLUGIN (object));
 
- g_debug ("GsdBackgroundPlugin finalizing");
+ g_debug ("MsdBackgroundPlugin finalizing");
 
- plugin = GSD_BACKGROUND_PLUGIN (object);
+ plugin = MSD_BACKGROUND_PLUGIN (object);
 
 g_return_if_fail (plugin->priv != NULL);
 
@@ -63,7 +63,7 @@ gsd_background_plugin_finalize (GObject *object)
 g_object_unref (plugin->priv->manager);
 }
 
- G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_background_plugin_parent_class)->finalize (object);
 }
 
 static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
 g_debug ("Activating background plugin");
 
 error = NULL;
- res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
+ res = msd_background_manager_start (MSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error);
 if (! res) {
 g_warning ("Unable to start background manager: %s", error->message);
 g_error_free (error);
@@ -86,19 +86,19 @@ static void
 impl_deactivate (MateSettingsPlugin *plugin)
 {
 g_debug ("Deactivating background plugin");
- gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
+ msd_background_manager_stop (MSD_BACKGROUND_PLUGIN (plugin)->priv->manager);
 }
 
 static void
-gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass)
+msd_background_plugin_class_init (MsdBackgroundPluginClass *klass)
 {
 GObjectClass *object_class = G_OBJECT_CLASS (klass);
 MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
 
- object_class->finalize = gsd_background_plugin_finalize;
+ object_class->finalize = msd_background_plugin_finalize;
 
 plugin_class->activate = impl_activate;
 plugin_class->deactivate = impl_deactivate;
 
- g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate));
+ g_type_class_add_private (klass, sizeof (MsdBackgroundPluginPrivate));
 }
diff --git a/plugins/background/gsd-background-plugin.h b/plugins/background/gsd-background-plugin.h
index 1acaf9f..dd52572 100644
--- a/plugins/background/gsd-background-plugin.h
+++ b/plugins/background/gsd-background-plugin.h
@@ -18,8 +18,8 @@
 *
 */
 
-#ifndef __GSD_BACKGROUND_PLUGIN_H__
-#define __GSD_BACKGROUND_PLUGIN_H__
+#ifndef __MSD_BACKGROUND_PLUGIN_H__
+#define __MSD_BACKGROUND_PLUGIN_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -31,27 +31,27 @@
 extern "C" {
 #endif
 
-#define GSD_TYPE_BACKGROUND_PLUGIN (gsd_background_plugin_get_type ())
-#define GSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin))
-#define GSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
-#define GSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN))
-#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN))
-#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass))
+#define MSD_TYPE_BACKGROUND_PLUGIN (msd_background_plugin_get_type ())
+#define MSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPlugin))
+#define MSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass))
+#define MSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_BACKGROUND_PLUGIN))
+#define MSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_BACKGROUND_PLUGIN))
+#define MSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass))
 
-typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate;
+typedef struct MsdBackgroundPluginPrivate MsdBackgroundPluginPrivate;
 
 typedef struct
 {
 MateSettingsPlugin parent;
- GsdBackgroundPluginPrivate *priv;
-} GsdBackgroundPlugin;
+ MsdBackgroundPluginPrivate *priv;
+} MsdBackgroundPlugin;
 
 typedef struct
 {
 MateSettingsPluginClass parent_class;
-} GsdBackgroundPluginClass;
+} MsdBackgroundPluginClass;
 
-GType gsd_background_plugin_get_type (void) G_GNUC_CONST;
+GType msd_background_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_BACKGROUND_PLUGIN_H__ */
+#endif /* __MSD_BACKGROUND_PLUGIN_H__ */
diff --git a/plugins/background/test-background.c b/plugins/background/test-background.c
index a7b5ef7..f9b0849 100644
--- a/plugins/background/test-background.c
+++ b/plugins/background/test-background.c
@@ -28,19 +28,19 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gsd-background-manager.h"
+#include "msd-background-manager.h"
 
 static gboolean
-idle (GsdBackgroundManager *manager)
+idle (MsdBackgroundManager *manager)
 {
- gsd_background_manager_start (manager, NULL);
+ msd_background_manager_start (manager, NULL);
 return FALSE;
 }
 
 int
 main (int argc, char *argv[])
 {
- GsdBackgroundManager *manager;
+ MsdBackgroundManager *manager;
 
 bindtextdomain (GETTEXT_PACKAGE, MATE_SETTINGS_LOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
 
 gtk_init (&argc, &argv);
 
- manager = gsd_background_manager_new ();
+ manager = msd_background_manager_new ();
 g_idle_add ((GSourceFunc)idle, manager);
 
 gtk_main ();
author	haxar <[email protected]>	2012-02-21 20:13:04 -0800
committer	haxar <[email protected]>	2012-02-21 20:13:04 -0800
commit	ddaceb232c8b537a7d29a9708928d3a3671b98e5 (patch)
tree	d874e557f2999f9550ad2b710f0231ed06f50ba8 /plugins/background
parent	ecd8a153901507f5d210d6f85103693ef81d49c3 (diff)
download	mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.bz2 mate-settings-daemon-ddaceb232c8b537a7d29a9708928d3a3671b98e5.tar.xz