diff options
Diffstat (limited to 'plugins/xrdb')
| -rw-r--r-- | plugins/xrdb/Makefile.am | 12 | ||||
| -rw-r--r-- | plugins/xrdb/gsd-xrdb-manager.c | 92 | ||||
| -rw-r--r-- | plugins/xrdb/gsd-xrdb-manager.h | 34 | ||||
| -rw-r--r-- | plugins/xrdb/gsd-xrdb-plugin.c | 42 | ||||
| -rw-r--r-- | plugins/xrdb/gsd-xrdb-plugin.h | 28 | 
5 files changed, 104 insertions, 104 deletions
| diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am index 1b8e82b..04946c8 100644 --- a/plugins/xrdb/Makefile.am +++ b/plugins/xrdb/Makefile.am @@ -9,10 +9,10 @@ plugin_LTLIBRARIES = \  	$(NULL)  libxrdb_la_SOURCES = 		\ -	gsd-xrdb-plugin.h	\ -	gsd-xrdb-plugin.c	\ -	gsd-xrdb-manager.h	\ -	gsd-xrdb-manager.c	\ +	msd-xrdb-plugin.h	\ +	msd-xrdb-plugin.c	\ +	msd-xrdb-manager.h	\ +	msd-xrdb-manager.c	\  	$(NULL)  libxrdb_la_CPPFLAGS = \ @@ -26,7 +26,7 @@ libxrdb_la_CFLAGS = \  	$(AM_CFLAGS)  libxrdb_la_LDFLAGS = 		\ -	$(GSD_PLUGIN_LDFLAGS)	\ +	$(MSD_PLUGIN_LDFLAGS)	\  	$(NULL)  libxrdb_la_LIBADD  = 		\ @@ -51,4 +51,4 @@ DISTCLEANFILES =		\  	$(plugin_DATA)		\  	$(NULL) -@GSD_INTLTOOL_PLUGIN_RULE@ +@MSD_INTLTOOL_PLUGIN_RULE@ diff --git a/plugins/xrdb/gsd-xrdb-manager.c b/plugins/xrdb/gsd-xrdb-manager.c index 5a53842..776d1e7 100644 --- a/plugins/xrdb/gsd-xrdb-manager.c +++ b/plugins/xrdb/gsd-xrdb-manager.c @@ -38,9 +38,9 @@  #include <gtk/gtk.h>  #include "mate-settings-profile.h" -#include "gsd-xrdb-manager.h" +#include "msd-xrdb-manager.h" -#define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate)) +#define MSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_XRDB_MANAGER, MsdXrdbManagerPrivate))  #define SYSTEM_AD_DIR    DATADIR "/xrdb"  #define GENERAL_AD       SYSTEM_AD_DIR "/General.ad" @@ -50,15 +50,15 @@  #define GTK_THEME_KEY "/desktop/mate/interface/gtk_theme" -struct GsdXrdbManagerPrivate { +struct MsdXrdbManagerPrivate {  	GtkWidget* widget;  }; -static void     gsd_xrdb_manager_class_init  (GsdXrdbManagerClass *klass); -static void     gsd_xrdb_manager_init        (GsdXrdbManager      *xrdb_manager); -static void     gsd_xrdb_manager_finalize    (GObject             *object); +static void     msd_xrdb_manager_class_init  (MsdXrdbManagerClass *klass); +static void     msd_xrdb_manager_init        (MsdXrdbManager      *xrdb_manager); +static void     msd_xrdb_manager_finalize    (GObject             *object); -G_DEFINE_TYPE (GsdXrdbManager, gsd_xrdb_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE (MsdXrdbManager, msd_xrdb_manager, G_TYPE_OBJECT)  static gpointer manager_object = NULL;  static void @@ -207,7 +207,7 @@ compare_basenames (gconstpointer a,   * right order for processing.   */  static GSList* -scan_for_files (GsdXrdbManager *manager, +scan_for_files (MsdXrdbManager *manager,                  GError        **error)  {          const char *home_dir; @@ -420,7 +420,7 @@ spawn_with_input (const char *command,  }  static void -apply_settings (GsdXrdbManager *manager, +apply_settings (MsdXrdbManager *manager,                  GtkStyle       *style)  {          const char *command; @@ -480,13 +480,13 @@ apply_settings (GsdXrdbManager *manager,  static void  theme_changed (GtkSettings    *settings,                 GParamSpec     *pspec, -               GsdXrdbManager *manager) +               MsdXrdbManager *manager)  {          apply_settings (manager, gtk_widget_get_style (manager->priv->widget));  }  gboolean -gsd_xrdb_manager_start (GsdXrdbManager *manager, +msd_xrdb_manager_start (MsdXrdbManager *manager,                          GError        **error)  {          mate_settings_profile_start (NULL); @@ -509,9 +509,9 @@ gsd_xrdb_manager_start (GsdXrdbManager *manager,  }  void -gsd_xrdb_manager_stop (GsdXrdbManager *manager) +msd_xrdb_manager_stop (MsdXrdbManager *manager)  { -        GsdXrdbManagerPrivate *p = manager->priv; +        MsdXrdbManagerPrivate *p = manager->priv;          g_debug ("Stopping xrdb manager"); @@ -526,14 +526,14 @@ gsd_xrdb_manager_stop (GsdXrdbManager *manager)  }  static void -gsd_xrdb_manager_set_property (GObject        *object, +msd_xrdb_manager_set_property (GObject        *object,                                 guint           prop_id,                                 const GValue   *value,                                 GParamSpec     *pspec)  { -        GsdXrdbManager *self; +        MsdXrdbManager *self; -        self = GSD_XRDB_MANAGER (object); +        self = MSD_XRDB_MANAGER (object);          switch (prop_id) {          default: @@ -543,14 +543,14 @@ gsd_xrdb_manager_set_property (GObject        *object,  }  static void -gsd_xrdb_manager_get_property (GObject        *object, +msd_xrdb_manager_get_property (GObject        *object,                                 guint           prop_id,                                 GValue         *value,                                 GParamSpec     *pspec)  { -        GsdXrdbManager *self; +        MsdXrdbManager *self; -        self = GSD_XRDB_MANAGER (object); +        self = MSD_XRDB_MANAGER (object);          switch (prop_id) {          default: @@ -560,16 +560,16 @@ gsd_xrdb_manager_get_property (GObject        *object,  }  static GObject * -gsd_xrdb_manager_constructor (GType                  type, +msd_xrdb_manager_constructor (GType                  type,                                guint                  n_construct_properties,                                GObjectConstructParam *construct_properties)  { -        GsdXrdbManager      *xrdb_manager; -        GsdXrdbManagerClass *klass; +        MsdXrdbManager      *xrdb_manager; +        MsdXrdbManagerClass *klass; -        klass = GSD_XRDB_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_XRDB_MANAGER)); +        klass = MSD_XRDB_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_XRDB_MANAGER)); -        xrdb_manager = GSD_XRDB_MANAGER (G_OBJECT_CLASS (gsd_xrdb_manager_parent_class)->constructor (type, +        xrdb_manager = MSD_XRDB_MANAGER (G_OBJECT_CLASS (msd_xrdb_manager_parent_class)->constructor (type,                                                                                                        n_construct_properties,                                                                                                        construct_properties)); @@ -577,61 +577,61 @@ gsd_xrdb_manager_constructor (GType                  type,  }  static void -gsd_xrdb_manager_dispose (GObject *object) +msd_xrdb_manager_dispose (GObject *object)  { -        GsdXrdbManager *xrdb_manager; +        MsdXrdbManager *xrdb_manager; -        xrdb_manager = GSD_XRDB_MANAGER (object); +        xrdb_manager = MSD_XRDB_MANAGER (object); -        G_OBJECT_CLASS (gsd_xrdb_manager_parent_class)->dispose (object); +        G_OBJECT_CLASS (msd_xrdb_manager_parent_class)->dispose (object);  }  static void -gsd_xrdb_manager_class_init (GsdXrdbManagerClass *klass) +msd_xrdb_manager_class_init (MsdXrdbManagerClass *klass)  {          GObjectClass *object_class = G_OBJECT_CLASS (klass); -        object_class->get_property = gsd_xrdb_manager_get_property; -        object_class->set_property = gsd_xrdb_manager_set_property; -        object_class->constructor = gsd_xrdb_manager_constructor; -        object_class->dispose = gsd_xrdb_manager_dispose; -        object_class->finalize = gsd_xrdb_manager_finalize; +        object_class->get_property = msd_xrdb_manager_get_property; +        object_class->set_property = msd_xrdb_manager_set_property; +        object_class->constructor = msd_xrdb_manager_constructor; +        object_class->dispose = msd_xrdb_manager_dispose; +        object_class->finalize = msd_xrdb_manager_finalize; -        g_type_class_add_private (klass, sizeof (GsdXrdbManagerPrivate)); +        g_type_class_add_private (klass, sizeof (MsdXrdbManagerPrivate));  }  static void -gsd_xrdb_manager_init (GsdXrdbManager *manager) +msd_xrdb_manager_init (MsdXrdbManager *manager)  { -        manager->priv = GSD_XRDB_MANAGER_GET_PRIVATE (manager); +        manager->priv = MSD_XRDB_MANAGER_GET_PRIVATE (manager);  }  static void -gsd_xrdb_manager_finalize (GObject *object) +msd_xrdb_manager_finalize (GObject *object)  { -        GsdXrdbManager *xrdb_manager; +        MsdXrdbManager *xrdb_manager;          g_return_if_fail (object != NULL); -        g_return_if_fail (GSD_IS_XRDB_MANAGER (object)); +        g_return_if_fail (MSD_IS_XRDB_MANAGER (object)); -        xrdb_manager = GSD_XRDB_MANAGER (object); +        xrdb_manager = MSD_XRDB_MANAGER (object);          g_return_if_fail (xrdb_manager->priv != NULL); -        G_OBJECT_CLASS (gsd_xrdb_manager_parent_class)->finalize (object); +        G_OBJECT_CLASS (msd_xrdb_manager_parent_class)->finalize (object);  } -GsdXrdbManager * -gsd_xrdb_manager_new (void) +MsdXrdbManager * +msd_xrdb_manager_new (void)  {          if (manager_object != NULL) {                  g_object_ref (manager_object);          } else { -                manager_object = g_object_new (GSD_TYPE_XRDB_MANAGER, NULL); +                manager_object = g_object_new (MSD_TYPE_XRDB_MANAGER, NULL);                  g_object_add_weak_pointer (manager_object,                                             (gpointer *) &manager_object);          } -        return GSD_XRDB_MANAGER (manager_object); +        return MSD_XRDB_MANAGER (manager_object);  } diff --git a/plugins/xrdb/gsd-xrdb-manager.h b/plugins/xrdb/gsd-xrdb-manager.h index 4588e69..cb83d24 100644 --- a/plugins/xrdb/gsd-xrdb-manager.h +++ b/plugins/xrdb/gsd-xrdb-manager.h @@ -18,8 +18,8 @@   *   */ -#ifndef __GSD_XRDB_MANAGER_H -#define __GSD_XRDB_MANAGER_H +#ifndef __MSD_XRDB_MANAGER_H +#define __MSD_XRDB_MANAGER_H  #include <glib-object.h> @@ -27,35 +27,35 @@  extern "C" {  #endif -#define GSD_TYPE_XRDB_MANAGER         (gsd_xrdb_manager_get_type ()) -#define GSD_XRDB_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManager)) -#define GSD_XRDB_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerClass)) -#define GSD_IS_XRDB_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_XRDB_MANAGER)) -#define GSD_IS_XRDB_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_XRDB_MANAGER)) -#define GSD_XRDB_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerClass)) +#define MSD_TYPE_XRDB_MANAGER         (msd_xrdb_manager_get_type ()) +#define MSD_XRDB_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_XRDB_MANAGER, MsdXrdbManager)) +#define MSD_XRDB_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_XRDB_MANAGER, MsdXrdbManagerClass)) +#define MSD_IS_XRDB_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_XRDB_MANAGER)) +#define MSD_IS_XRDB_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_XRDB_MANAGER)) +#define MSD_XRDB_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_XRDB_MANAGER, MsdXrdbManagerClass)) -typedef struct GsdXrdbManagerPrivate GsdXrdbManagerPrivate; +typedef struct MsdXrdbManagerPrivate MsdXrdbManagerPrivate;  typedef struct  {          GObject                     parent; -        GsdXrdbManagerPrivate *priv; -} GsdXrdbManager; +        MsdXrdbManagerPrivate *priv; +} MsdXrdbManager;  typedef struct  {          GObjectClass   parent_class; -} GsdXrdbManagerClass; +} MsdXrdbManagerClass; -GType                   gsd_xrdb_manager_get_type            (void); +GType                   msd_xrdb_manager_get_type            (void); -GsdXrdbManager *        gsd_xrdb_manager_new                 (void); -gboolean                gsd_xrdb_manager_start               (GsdXrdbManager *manager, +MsdXrdbManager *        msd_xrdb_manager_new                 (void); +gboolean                msd_xrdb_manager_start               (MsdXrdbManager *manager,                                                                GError        **error); -void                    gsd_xrdb_manager_stop                (GsdXrdbManager *manager); +void                    msd_xrdb_manager_stop                (MsdXrdbManager *manager);  #ifdef __cplusplus  }  #endif -#endif /* __GSD_XRDB_MANAGER_H */ +#endif /* __MSD_XRDB_MANAGER_H */ diff --git a/plugins/xrdb/gsd-xrdb-plugin.c b/plugins/xrdb/gsd-xrdb-plugin.c index 870eb56..1efe570 100644 --- a/plugins/xrdb/gsd-xrdb-plugin.c +++ b/plugins/xrdb/gsd-xrdb-plugin.c @@ -24,38 +24,38 @@  #include <gmodule.h>  #include "mate-settings-plugin.h" -#include "gsd-xrdb-plugin.h" -#include "gsd-xrdb-manager.h" +#include "msd-xrdb-plugin.h" +#include "msd-xrdb-manager.h" -struct GsdXrdbPluginPrivate { -        GsdXrdbManager *manager; +struct MsdXrdbPluginPrivate { +        MsdXrdbManager *manager;  }; -#define GSD_XRDB_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_XRDB_PLUGIN, GsdXrdbPluginPrivate)) +#define MSD_XRDB_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_XRDB_PLUGIN, MsdXrdbPluginPrivate)) -MATE_SETTINGS_PLUGIN_REGISTER (GsdXrdbPlugin, gsd_xrdb_plugin) +MATE_SETTINGS_PLUGIN_REGISTER (MsdXrdbPlugin, msd_xrdb_plugin)  static void -gsd_xrdb_plugin_init (GsdXrdbPlugin *plugin) +msd_xrdb_plugin_init (MsdXrdbPlugin *plugin)  { -        plugin->priv = GSD_XRDB_PLUGIN_GET_PRIVATE (plugin); +        plugin->priv = MSD_XRDB_PLUGIN_GET_PRIVATE (plugin); -        g_debug ("GsdXrdbPlugin initializing"); +        g_debug ("MsdXrdbPlugin initializing"); -        plugin->priv->manager = gsd_xrdb_manager_new (); +        plugin->priv->manager = msd_xrdb_manager_new ();  }  static void -gsd_xrdb_plugin_finalize (GObject *object) +msd_xrdb_plugin_finalize (GObject *object)  { -        GsdXrdbPlugin *plugin; +        MsdXrdbPlugin *plugin;          g_return_if_fail (object != NULL); -        g_return_if_fail (GSD_IS_XRDB_PLUGIN (object)); +        g_return_if_fail (MSD_IS_XRDB_PLUGIN (object)); -        g_debug ("GsdXrdbPlugin finalizing"); +        g_debug ("MsdXrdbPlugin finalizing"); -        plugin = GSD_XRDB_PLUGIN (object); +        plugin = MSD_XRDB_PLUGIN (object);          g_return_if_fail (plugin->priv != NULL); @@ -63,7 +63,7 @@ gsd_xrdb_plugin_finalize (GObject *object)                  g_object_unref (plugin->priv->manager);          } -        G_OBJECT_CLASS (gsd_xrdb_plugin_parent_class)->finalize (object); +        G_OBJECT_CLASS (msd_xrdb_plugin_parent_class)->finalize (object);  }  static void @@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)          g_debug ("Activating xrdb plugin");          error = NULL; -        res = gsd_xrdb_manager_start (GSD_XRDB_PLUGIN (plugin)->priv->manager, &error); +        res = msd_xrdb_manager_start (MSD_XRDB_PLUGIN (plugin)->priv->manager, &error);          if (! res) {                  g_warning ("Unable to start xrdb manager: %s", error->message);                  g_error_free (error); @@ -86,19 +86,19 @@ static void  impl_deactivate (MateSettingsPlugin *plugin)  {          g_debug ("Deactivating xrdb plugin"); -        gsd_xrdb_manager_stop (GSD_XRDB_PLUGIN (plugin)->priv->manager); +        msd_xrdb_manager_stop (MSD_XRDB_PLUGIN (plugin)->priv->manager);  }  static void -gsd_xrdb_plugin_class_init (GsdXrdbPluginClass *klass) +msd_xrdb_plugin_class_init (MsdXrdbPluginClass *klass)  {          GObjectClass             *object_class = G_OBJECT_CLASS (klass);          MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass); -        object_class->finalize = gsd_xrdb_plugin_finalize; +        object_class->finalize = msd_xrdb_plugin_finalize;          plugin_class->activate = impl_activate;          plugin_class->deactivate = impl_deactivate; -        g_type_class_add_private (klass, sizeof (GsdXrdbPluginPrivate)); +        g_type_class_add_private (klass, sizeof (MsdXrdbPluginPrivate));  } diff --git a/plugins/xrdb/gsd-xrdb-plugin.h b/plugins/xrdb/gsd-xrdb-plugin.h index 9baa26a..893835b 100644 --- a/plugins/xrdb/gsd-xrdb-plugin.h +++ b/plugins/xrdb/gsd-xrdb-plugin.h @@ -18,8 +18,8 @@   *   */ -#ifndef __GSD_XRDB_PLUGIN_H__ -#define __GSD_XRDB_PLUGIN_H__ +#ifndef __MSD_XRDB_PLUGIN_H__ +#define __MSD_XRDB_PLUGIN_H__  #include <glib.h>  #include <glib-object.h> @@ -31,27 +31,27 @@  extern "C" {  #endif -#define GSD_TYPE_XRDB_PLUGIN                (gsd_xrdb_plugin_get_type ()) -#define GSD_XRDB_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_XRDB_PLUGIN, GsdXrdbPlugin)) -#define GSD_XRDB_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_XRDB_PLUGIN, GsdXrdbPluginClass)) -#define GSD_IS_XRDB_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_XRDB_PLUGIN)) -#define GSD_IS_XRDB_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_XRDB_PLUGIN)) -#define GSD_XRDB_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_XRDB_PLUGIN, GsdXrdbPluginClass)) +#define MSD_TYPE_XRDB_PLUGIN                (msd_xrdb_plugin_get_type ()) +#define MSD_XRDB_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_XRDB_PLUGIN, MsdXrdbPlugin)) +#define MSD_XRDB_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_XRDB_PLUGIN, MsdXrdbPluginClass)) +#define MSD_IS_XRDB_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_XRDB_PLUGIN)) +#define MSD_IS_XRDB_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_XRDB_PLUGIN)) +#define MSD_XRDB_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_XRDB_PLUGIN, MsdXrdbPluginClass)) -typedef struct GsdXrdbPluginPrivate GsdXrdbPluginPrivate; +typedef struct MsdXrdbPluginPrivate MsdXrdbPluginPrivate;  typedef struct  {          MateSettingsPlugin   parent; -        GsdXrdbPluginPrivate *priv; -} GsdXrdbPlugin; +        MsdXrdbPluginPrivate *priv; +} MsdXrdbPlugin;  typedef struct  {          MateSettingsPluginClass parent_class; -} GsdXrdbPluginClass; +} MsdXrdbPluginClass; -GType   gsd_xrdb_plugin_get_type            (void) G_GNUC_CONST; +GType   msd_xrdb_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_XRDB_PLUGIN_H__ */ +#endif /* __MSD_XRDB_PLUGIN_H__ */ | 
