summaryrefslogtreecommitdiff
path: root/plugins/clipboard
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-02-22 03:44:27 -0800
committerStefano Karapetsas <[email protected]>2012-02-22 03:44:27 -0800
commit2dfe3164d9f195b50e066def8e2a4782b5910c10 (patch)
treef95660c9462b74c2775355c29df79267fc30501b /plugins/clipboard
parentecd8a153901507f5d210d6f85103693ef81d49c3 (diff)
parente46b4adef5c6c6805b3ca6dbfbe99a4299252514 (diff)
downloadmate-settings-daemon-2dfe3164d9f195b50e066def8e2a4782b5910c10.tar.bz2
mate-settings-daemon-2dfe3164d9f195b50e066def8e2a4782b5910c10.tar.xz
Merge pull request #3 from haxar/master
gsd to msd complete rename patch by NiceandGently
Diffstat (limited to 'plugins/clipboard')
-rw-r--r--plugins/clipboard/Makefile.am12
-rw-r--r--plugins/clipboard/gsd-clipboard-manager.h61
-rw-r--r--plugins/clipboard/msd-clipboard-manager.c (renamed from plugins/clipboard/gsd-clipboard-manager.c)114
-rw-r--r--plugins/clipboard/msd-clipboard-manager.h61
-rw-r--r--plugins/clipboard/msd-clipboard-plugin.c (renamed from plugins/clipboard/gsd-clipboard-plugin.c)42
-rw-r--r--plugins/clipboard/msd-clipboard-plugin.h (renamed from plugins/clipboard/gsd-clipboard-plugin.h)28
6 files changed, 159 insertions, 159 deletions
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index f50a86e..4b1fdca 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -5,10 +5,10 @@ plugin_LTLIBRARIES = \
$(NULL)
libclipboard_la_SOURCES = \
- gsd-clipboard-plugin.h \
- gsd-clipboard-plugin.c \
- gsd-clipboard-manager.h \
- gsd-clipboard-manager.c \
+ msd-clipboard-plugin.h \
+ msd-clipboard-plugin.c \
+ msd-clipboard-manager.h \
+ msd-clipboard-manager.c \
xutils.h \
xutils.c \
list.h \
@@ -25,7 +25,7 @@ libclipboard_la_CFLAGS = \
$(AM_CFLAGS)
libclipboard_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS) \
+ $(MSD_PLUGIN_LDFLAGS) \
$(NULL)
libclipboard_la_LIBADD = \
@@ -50,4 +50,4 @@ DISTCLEANFILES = \
$(plugin_DATA) \
$(NULL)
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/clipboard/gsd-clipboard-manager.h b/plugins/clipboard/gsd-clipboard-manager.h
deleted file mode 100644
index 0338799..0000000
--- a/plugins/clipboard/gsd-clipboard-manager.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2007 William Jon McCann <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __GSD_CLIPBOARD_MANAGER_H
-#define __GSD_CLIPBOARD_MANAGER_H
-
-#include <glib-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GSD_TYPE_CLIPBOARD_MANAGER (gsd_clipboard_manager_get_type ())
-#define GSD_CLIPBOARD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_CLIPBOARD_MANAGER, GsdClipboardManager))
-#define GSD_CLIPBOARD_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_CLIPBOARD_MANAGER, GsdClipboardManagerClass))
-#define GSD_IS_CLIPBOARD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_CLIPBOARD_MANAGER))
-#define GSD_IS_CLIPBOARD_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_CLIPBOARD_MANAGER))
-#define GSD_CLIPBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_CLIPBOARD_MANAGER, GsdClipboardManagerClass))
-
-typedef struct GsdClipboardManagerPrivate GsdClipboardManagerPrivate;
-
-typedef struct
-{
- GObject parent;
- GsdClipboardManagerPrivate *priv;
-} GsdClipboardManager;
-
-typedef struct
-{
- GObjectClass parent_class;
-} GsdClipboardManagerClass;
-
-GType gsd_clipboard_manager_get_type (void);
-
-GsdClipboardManager * gsd_clipboard_manager_new (void);
-gboolean gsd_clipboard_manager_start (GsdClipboardManager *manager,
- GError **error);
-void gsd_clipboard_manager_stop (GsdClipboardManager *manager);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GSD_CLIPBOARD_MANAGER_H */
diff --git a/plugins/clipboard/gsd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index fcbc839..c6d5a57 100644
--- a/plugins/clipboard/gsd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -45,11 +45,11 @@
#include "list.h"
#include "mate-settings-profile.h"
-#include "gsd-clipboard-manager.h"
+#include "msd-clipboard-manager.h"
-#define GSD_CLIPBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_CLIPBOARD_MANAGER, GsdClipboardManagerPrivate))
+#define MSD_CLIPBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_CLIPBOARD_MANAGER, MsdClipboardManagerPrivate))
-struct GsdClipboardManagerPrivate
+struct MsdClipboardManagerPrivate
{
Display *display;
Window window;
@@ -82,17 +82,17 @@ typedef struct
int offset;
} IncrConversion;
-static void gsd_clipboard_manager_class_init (GsdClipboardManagerClass *klass);
-static void gsd_clipboard_manager_init (GsdClipboardManager *clipboard_manager);
-static void gsd_clipboard_manager_finalize (GObject *object);
+static void msd_clipboard_manager_class_init (MsdClipboardManagerClass *klass);
+static void msd_clipboard_manager_init (MsdClipboardManager *clipboard_manager);
+static void msd_clipboard_manager_finalize (GObject *object);
-static void clipboard_manager_watch_cb (GsdClipboardManager *manager,
+static void clipboard_manager_watch_cb (MsdClipboardManager *manager,
Window window,
Bool is_start,
long mask,
void *cb_data);
-G_DEFINE_TYPE (GsdClipboardManager, gsd_clipboard_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdClipboardManager, msd_clipboard_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
@@ -127,7 +127,7 @@ conversion_free (IncrConversion *rdata)
}
static void
-send_selection_notify (GsdClipboardManager *manager,
+send_selection_notify (MsdClipboardManager *manager,
Bool success)
{
XSelectionEvent notify;
@@ -155,7 +155,7 @@ send_selection_notify (GsdClipboardManager *manager,
}
static void
-finish_selection_request (GsdClipboardManager *manager,
+finish_selection_request (MsdClipboardManager *manager,
XEvent *xev,
Bool success)
{
@@ -195,7 +195,7 @@ clipboard_bytes_per_item (int format)
}
static void
-save_targets (GsdClipboardManager *manager,
+save_targets (MsdClipboardManager *manager,
Atom *save_targets,
int nitems)
{
@@ -263,7 +263,7 @@ find_conversion_requestor (IncrConversion *rdata,
static void
get_property (TargetData *tdata,
- GsdClipboardManager *manager)
+ MsdClipboardManager *manager)
{
Atom type;
int format;
@@ -300,7 +300,7 @@ get_property (TargetData *tdata,
}
static Bool
-receive_incrementally (GsdClipboardManager *manager,
+receive_incrementally (MsdClipboardManager *manager,
XEvent *xev)
{
List *list;
@@ -359,7 +359,7 @@ receive_incrementally (GsdClipboardManager *manager,
}
static Bool
-send_incrementally (GsdClipboardManager *manager,
+send_incrementally (MsdClipboardManager *manager,
XEvent *xev)
{
List *list;
@@ -397,7 +397,7 @@ send_incrementally (GsdClipboardManager *manager,
}
static void
-convert_clipboard_manager (GsdClipboardManager *manager,
+convert_clipboard_manager (MsdClipboardManager *manager,
XEvent *xev)
{
Atom type = None;
@@ -486,7 +486,7 @@ convert_clipboard_manager (GsdClipboardManager *manager,
static void
convert_clipboard_target (IncrConversion *rdata,
- GsdClipboardManager *manager)
+ MsdClipboardManager *manager)
{
TargetData *tdata;
Atom *targets;
@@ -561,7 +561,7 @@ convert_clipboard_target (IncrConversion *rdata,
static void
collect_incremental (IncrConversion *rdata,
- GsdClipboardManager *manager)
+ MsdClipboardManager *manager)
{
if (rdata->offset >= 0)
manager->priv->conversions = list_prepend (manager->priv->conversions, rdata);
@@ -575,7 +575,7 @@ collect_incremental (IncrConversion *rdata,
}
static void
-convert_clipboard (GsdClipboardManager *manager,
+convert_clipboard (MsdClipboardManager *manager,
XEvent *xev)
{
List *list;
@@ -656,7 +656,7 @@ convert_clipboard (GsdClipboardManager *manager,
}
static Bool
-clipboard_manager_process_event (GsdClipboardManager *manager,
+clipboard_manager_process_event (MsdClipboardManager *manager,
XEvent *xev)
{
Atom type;
@@ -805,7 +805,7 @@ clipboard_manager_process_event (GsdClipboardManager *manager,
static GdkFilterReturn
clipboard_manager_event_filter (GdkXEvent *xevent,
GdkEvent *event,
- GsdClipboardManager *manager)
+ MsdClipboardManager *manager)
{
if (clipboard_manager_process_event (manager, (XEvent *)xevent)) {
return GDK_FILTER_REMOVE;
@@ -815,7 +815,7 @@ clipboard_manager_event_filter (GdkXEvent *xevent,
}
static void
-clipboard_manager_watch_cb (GsdClipboardManager *manager,
+clipboard_manager_watch_cb (MsdClipboardManager *manager,
Window window,
Bool is_start,
long mask,
@@ -849,7 +849,7 @@ clipboard_manager_watch_cb (GsdClipboardManager *manager,
}
static gboolean
-start_clipboard_idle_cb (GsdClipboardManager *manager)
+start_clipboard_idle_cb (MsdClipboardManager *manager)
{
XClientMessageEvent xev;
@@ -924,7 +924,7 @@ start_clipboard_idle_cb (GsdClipboardManager *manager)
}
gboolean
-gsd_clipboard_manager_start (GsdClipboardManager *manager,
+msd_clipboard_manager_start (MsdClipboardManager *manager,
GError **error)
{
mate_settings_profile_start (NULL);
@@ -937,7 +937,7 @@ gsd_clipboard_manager_start (GsdClipboardManager *manager,
}
void
-gsd_clipboard_manager_stop (GsdClipboardManager *manager)
+msd_clipboard_manager_stop (MsdClipboardManager *manager)
{
g_debug ("Stopping clipboard manager");
@@ -956,14 +956,14 @@ gsd_clipboard_manager_stop (GsdClipboardManager *manager)
}
static void
-gsd_clipboard_manager_set_property (GObject *object,
+msd_clipboard_manager_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- GsdClipboardManager *self;
+ MsdClipboardManager *self;
- self = GSD_CLIPBOARD_MANAGER (object);
+ self = MSD_CLIPBOARD_MANAGER (object);
switch (prop_id) {
default:
@@ -973,14 +973,14 @@ gsd_clipboard_manager_set_property (GObject *object,
}
static void
-gsd_clipboard_manager_get_property (GObject *object,
+msd_clipboard_manager_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GsdClipboardManager *self;
+ MsdClipboardManager *self;
- self = GSD_CLIPBOARD_MANAGER (object);
+ self = MSD_CLIPBOARD_MANAGER (object);
switch (prop_id) {
default:
@@ -990,16 +990,16 @@ gsd_clipboard_manager_get_property (GObject *object,
}
static GObject *
-gsd_clipboard_manager_constructor (GType type,
+msd_clipboard_manager_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
- GsdClipboardManager *clipboard_manager;
- GsdClipboardManagerClass *klass;
+ MsdClipboardManager *clipboard_manager;
+ MsdClipboardManagerClass *klass;
- klass = GSD_CLIPBOARD_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_CLIPBOARD_MANAGER));
+ klass = MSD_CLIPBOARD_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_CLIPBOARD_MANAGER));
- clipboard_manager = GSD_CLIPBOARD_MANAGER (G_OBJECT_CLASS (gsd_clipboard_manager_parent_class)->constructor (type,
+ clipboard_manager = MSD_CLIPBOARD_MANAGER (G_OBJECT_CLASS (msd_clipboard_manager_parent_class)->constructor (type,
n_construct_properties,
construct_properties));
@@ -1007,63 +1007,63 @@ gsd_clipboard_manager_constructor (GType type,
}
static void
-gsd_clipboard_manager_dispose (GObject *object)
+msd_clipboard_manager_dispose (GObject *object)
{
- GsdClipboardManager *clipboard_manager;
+ MsdClipboardManager *clipboard_manager;
- clipboard_manager = GSD_CLIPBOARD_MANAGER (object);
+ clipboard_manager = MSD_CLIPBOARD_MANAGER (object);
- G_OBJECT_CLASS (gsd_clipboard_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (msd_clipboard_manager_parent_class)->dispose (object);
}
static void
-gsd_clipboard_manager_class_init (GsdClipboardManagerClass *klass)
+msd_clipboard_manager_class_init (MsdClipboardManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->get_property = gsd_clipboard_manager_get_property;
- object_class->set_property = gsd_clipboard_manager_set_property;
- object_class->constructor = gsd_clipboard_manager_constructor;
- object_class->dispose = gsd_clipboard_manager_dispose;
- object_class->finalize = gsd_clipboard_manager_finalize;
+ object_class->get_property = msd_clipboard_manager_get_property;
+ object_class->set_property = msd_clipboard_manager_set_property;
+ object_class->constructor = msd_clipboard_manager_constructor;
+ object_class->dispose = msd_clipboard_manager_dispose;
+ object_class->finalize = msd_clipboard_manager_finalize;
- g_type_class_add_private (klass, sizeof (GsdClipboardManagerPrivate));
+ g_type_class_add_private (klass, sizeof (MsdClipboardManagerPrivate));
}
static void
-gsd_clipboard_manager_init (GsdClipboardManager *manager)
+msd_clipboard_manager_init (MsdClipboardManager *manager)
{
- manager->priv = GSD_CLIPBOARD_MANAGER_GET_PRIVATE (manager);
+ manager->priv = MSD_CLIPBOARD_MANAGER_GET_PRIVATE (manager);
manager->priv->display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
}
static void
-gsd_clipboard_manager_finalize (GObject *object)
+msd_clipboard_manager_finalize (GObject *object)
{
- GsdClipboardManager *clipboard_manager;
+ MsdClipboardManager *clipboard_manager;
g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_CLIPBOARD_MANAGER (object));
+ g_return_if_fail (MSD_IS_CLIPBOARD_MANAGER (object));
- clipboard_manager = GSD_CLIPBOARD_MANAGER (object);
+ clipboard_manager = MSD_CLIPBOARD_MANAGER (object);
g_return_if_fail (clipboard_manager->priv != NULL);
- G_OBJECT_CLASS (gsd_clipboard_manager_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_clipboard_manager_parent_class)->finalize (object);
}
-GsdClipboardManager *
-gsd_clipboard_manager_new (void)
+MsdClipboardManager *
+msd_clipboard_manager_new (void)
{
if (manager_object != NULL) {
g_object_ref (manager_object);
} else {
- manager_object = g_object_new (GSD_TYPE_CLIPBOARD_MANAGER, NULL);
+ manager_object = g_object_new (MSD_TYPE_CLIPBOARD_MANAGER, NULL);
g_object_add_weak_pointer (manager_object,
(gpointer *) &manager_object);
}
- return GSD_CLIPBOARD_MANAGER (manager_object);
+ return MSD_CLIPBOARD_MANAGER (manager_object);
}
diff --git a/plugins/clipboard/msd-clipboard-manager.h b/plugins/clipboard/msd-clipboard-manager.h
new file mode 100644
index 0000000..e4af711
--- /dev/null
+++ b/plugins/clipboard/msd-clipboard-manager.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __MSD_CLIPBOARD_MANAGER_H
+#define __MSD_CLIPBOARD_MANAGER_H
+
+#include <glib-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MSD_TYPE_CLIPBOARD_MANAGER (msd_clipboard_manager_get_type ())
+#define MSD_CLIPBOARD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_CLIPBOARD_MANAGER, MsdClipboardManager))
+#define MSD_CLIPBOARD_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_CLIPBOARD_MANAGER, MsdClipboardManagerClass))
+#define MSD_IS_CLIPBOARD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_CLIPBOARD_MANAGER))
+#define MSD_IS_CLIPBOARD_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_CLIPBOARD_MANAGER))
+#define MSD_CLIPBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_CLIPBOARD_MANAGER, MsdClipboardManagerClass))
+
+typedef struct MsdClipboardManagerPrivate MsdClipboardManagerPrivate;
+
+typedef struct
+{
+ GObject parent;
+ MsdClipboardManagerPrivate *priv;
+} MsdClipboardManager;
+
+typedef struct
+{
+ GObjectClass parent_class;
+} MsdClipboardManagerClass;
+
+GType msd_clipboard_manager_get_type (void);
+
+MsdClipboardManager * msd_clipboard_manager_new (void);
+gboolean msd_clipboard_manager_start (MsdClipboardManager *manager,
+ GError **error);
+void msd_clipboard_manager_stop (MsdClipboardManager *manager);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSD_CLIPBOARD_MANAGER_H */
diff --git a/plugins/clipboard/gsd-clipboard-plugin.c b/plugins/clipboard/msd-clipboard-plugin.c
index f384b52..6674265 100644
--- a/plugins/clipboard/gsd-clipboard-plugin.c
+++ b/plugins/clipboard/msd-clipboard-plugin.c
@@ -24,38 +24,38 @@
#include <gmodule.h>
#include "mate-settings-plugin.h"
-#include "gsd-clipboard-plugin.h"
-#include "gsd-clipboard-manager.h"
+#include "msd-clipboard-plugin.h"
+#include "msd-clipboard-manager.h"
-struct GsdClipboardPluginPrivate {
- GsdClipboardManager *manager;
+struct MsdClipboardPluginPrivate {
+ MsdClipboardManager *manager;
};
-#define GSD_CLIPBOARD_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_CLIPBOARD_PLUGIN, GsdClipboardPluginPrivate))
+#define MSD_CLIPBOARD_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_CLIPBOARD_PLUGIN, MsdClipboardPluginPrivate))
-MATE_SETTINGS_PLUGIN_REGISTER (GsdClipboardPlugin, gsd_clipboard_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdClipboardPlugin, msd_clipboard_plugin)
static void
-gsd_clipboard_plugin_init (GsdClipboardPlugin *plugin)
+msd_clipboard_plugin_init (MsdClipboardPlugin *plugin)
{
- plugin->priv = GSD_CLIPBOARD_PLUGIN_GET_PRIVATE (plugin);
+ plugin->priv = MSD_CLIPBOARD_PLUGIN_GET_PRIVATE (plugin);
- g_debug ("GsdClipboardPlugin initializing");
+ g_debug ("MsdClipboardPlugin initializing");
- plugin->priv->manager = gsd_clipboard_manager_new ();
+ plugin->priv->manager = msd_clipboard_manager_new ();
}
static void
-gsd_clipboard_plugin_finalize (GObject *object)
+msd_clipboard_plugin_finalize (GObject *object)
{
- GsdClipboardPlugin *plugin;
+ MsdClipboardPlugin *plugin;
g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_CLIPBOARD_PLUGIN (object));
+ g_return_if_fail (MSD_IS_CLIPBOARD_PLUGIN (object));
- g_debug ("GsdClipboardPlugin finalizing");
+ g_debug ("MsdClipboardPlugin finalizing");
- plugin = GSD_CLIPBOARD_PLUGIN (object);
+ plugin = MSD_CLIPBOARD_PLUGIN (object);
g_return_if_fail (plugin->priv != NULL);
@@ -63,7 +63,7 @@ gsd_clipboard_plugin_finalize (GObject *object)
g_object_unref (plugin->priv->manager);
}
- G_OBJECT_CLASS (gsd_clipboard_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_clipboard_plugin_parent_class)->finalize (object);
}
static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
g_debug ("Activating clipboard plugin");
error = NULL;
- res = gsd_clipboard_manager_start (GSD_CLIPBOARD_PLUGIN (plugin)->priv->manager, &error);
+ res = msd_clipboard_manager_start (MSD_CLIPBOARD_PLUGIN (plugin)->priv->manager, &error);
if (! res) {
g_warning ("Unable to start clipboard manager: %s", error->message);
g_error_free (error);
@@ -86,19 +86,19 @@ static void
impl_deactivate (MateSettingsPlugin *plugin)
{
g_debug ("Deactivating clipboard plugin");
- gsd_clipboard_manager_stop (GSD_CLIPBOARD_PLUGIN (plugin)->priv->manager);
+ msd_clipboard_manager_stop (MSD_CLIPBOARD_PLUGIN (plugin)->priv->manager);
}
static void
-gsd_clipboard_plugin_class_init (GsdClipboardPluginClass *klass)
+msd_clipboard_plugin_class_init (MsdClipboardPluginClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
- object_class->finalize = gsd_clipboard_plugin_finalize;
+ object_class->finalize = msd_clipboard_plugin_finalize;
plugin_class->activate = impl_activate;
plugin_class->deactivate = impl_deactivate;
- g_type_class_add_private (klass, sizeof (GsdClipboardPluginPrivate));
+ g_type_class_add_private (klass, sizeof (MsdClipboardPluginPrivate));
}
diff --git a/plugins/clipboard/gsd-clipboard-plugin.h b/plugins/clipboard/msd-clipboard-plugin.h
index 4148c09..7b2ea1e 100644
--- a/plugins/clipboard/gsd-clipboard-plugin.h
+++ b/plugins/clipboard/msd-clipboard-plugin.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef __GSD_CLIPBOARD_PLUGIN_H__
-#define __GSD_CLIPBOARD_PLUGIN_H__
+#ifndef __MSD_CLIPBOARD_PLUGIN_H__
+#define __MSD_CLIPBOARD_PLUGIN_H__
#include <glib.h>
#include <glib-object.h>
@@ -31,27 +31,27 @@
extern "C" {
#endif
-#define GSD_TYPE_CLIPBOARD_PLUGIN (gsd_clipboard_plugin_get_type ())
-#define GSD_CLIPBOARD_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_CLIPBOARD_PLUGIN, GsdClipboardPlugin))
-#define GSD_CLIPBOARD_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_CLIPBOARD_PLUGIN, GsdClipboardPluginClass))
-#define GSD_IS_CLIPBOARD_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_CLIPBOARD_PLUGIN))
-#define GSD_IS_CLIPBOARD_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_CLIPBOARD_PLUGIN))
-#define GSD_CLIPBOARD_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_CLIPBOARD_PLUGIN, GsdClipboardPluginClass))
+#define MSD_TYPE_CLIPBOARD_PLUGIN (msd_clipboard_plugin_get_type ())
+#define MSD_CLIPBOARD_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_CLIPBOARD_PLUGIN, MsdClipboardPlugin))
+#define MSD_CLIPBOARD_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_CLIPBOARD_PLUGIN, MsdClipboardPluginClass))
+#define MSD_IS_CLIPBOARD_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_CLIPBOARD_PLUGIN))
+#define MSD_IS_CLIPBOARD_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_CLIPBOARD_PLUGIN))
+#define MSD_CLIPBOARD_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_CLIPBOARD_PLUGIN, MsdClipboardPluginClass))
-typedef struct GsdClipboardPluginPrivate GsdClipboardPluginPrivate;
+typedef struct MsdClipboardPluginPrivate MsdClipboardPluginPrivate;
typedef struct
{
MateSettingsPlugin parent;
- GsdClipboardPluginPrivate *priv;
-} GsdClipboardPlugin;
+ MsdClipboardPluginPrivate *priv;
+} MsdClipboardPlugin;
typedef struct
{
MateSettingsPluginClass parent_class;
-} GsdClipboardPluginClass;
+} MsdClipboardPluginClass;
-GType gsd_clipboard_plugin_get_type (void) G_GNUC_CONST;
+GType msd_clipboard_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_CLIPBOARD_PLUGIN_H__ */
+#endif /* __MSD_CLIPBOARD_PLUGIN_H__ */