summaryrefslogtreecommitdiff
path: root/plugins/keybindings
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/keybindings
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/keybindings')
-rw-r--r--plugins/keybindings/Makefile.am12
-rw-r--r--plugins/keybindings/gsd-keybindings-manager.h61
-rw-r--r--plugins/keybindings/msd-keybindings-manager.c (renamed from plugins/keybindings/gsd-keybindings-manager.c)102
-rw-r--r--plugins/keybindings/msd-keybindings-manager.h61
-rw-r--r--plugins/keybindings/msd-keybindings-plugin.c (renamed from plugins/keybindings/gsd-keybindings-plugin.c)42
-rw-r--r--plugins/keybindings/msd-keybindings-plugin.h (renamed from plugins/keybindings/gsd-keybindings-plugin.h)28
6 files changed, 153 insertions, 153 deletions
diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am
index c4fe7b2..d8e2b5f 100644
--- a/plugins/keybindings/Makefile.am
+++ b/plugins/keybindings/Makefile.am
@@ -5,10 +5,10 @@ plugin_LTLIBRARIES = \
$(NULL)
libkeybindings_la_SOURCES = \
- gsd-keybindings-plugin.h \
- gsd-keybindings-plugin.c \
- gsd-keybindings-manager.h \
- gsd-keybindings-manager.c \
+ msd-keybindings-plugin.h \
+ msd-keybindings-plugin.c \
+ msd-keybindings-manager.h \
+ msd-keybindings-manager.c \
$(NULL)
libkeybindings_la_CPPFLAGS = \
@@ -22,7 +22,7 @@ libkeybindings_la_CFLAGS = \
$(AM_CFLAGS)
libkeybindings_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS) \
+ $(MSD_PLUGIN_LDFLAGS) \
$(NULL)
libkeybindings_la_LIBADD = \
@@ -48,4 +48,4 @@ DISTCLEANFILES = \
$(plugin_DATA) \
$(NULL)
-@GSD_INTLTOOL_PLUGIN_RULE@
+@MSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/keybindings/gsd-keybindings-manager.h b/plugins/keybindings/gsd-keybindings-manager.h
deleted file mode 100644
index 7de64d9..0000000
--- a/plugins/keybindings/gsd-keybindings-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_KEYBINDINGS_MANAGER_H
-#define __GSD_KEYBINDINGS_MANAGER_H
-
-#include <glib-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GSD_TYPE_KEYBINDINGS_MANAGER (gsd_keybindings_manager_get_type ())
-#define GSD_KEYBINDINGS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_KEYBINDINGS_MANAGER, GsdKeybindingsManager))
-#define GSD_KEYBINDINGS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_KEYBINDINGS_MANAGER, GsdKeybindingsManagerClass))
-#define GSD_IS_KEYBINDINGS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_KEYBINDINGS_MANAGER))
-#define GSD_IS_KEYBINDINGS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_KEYBINDINGS_MANAGER))
-#define GSD_KEYBINDINGS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_KEYBINDINGS_MANAGER, GsdKeybindingsManagerClass))
-
-typedef struct GsdKeybindingsManagerPrivate GsdKeybindingsManagerPrivate;
-
-typedef struct
-{
- GObject parent;
- GsdKeybindingsManagerPrivate *priv;
-} GsdKeybindingsManager;
-
-typedef struct
-{
- GObjectClass parent_class;
-} GsdKeybindingsManagerClass;
-
-GType gsd_keybindings_manager_get_type (void);
-
-GsdKeybindingsManager * gsd_keybindings_manager_new (void);
-gboolean gsd_keybindings_manager_start (GsdKeybindingsManager *manager,
- GError **error);
-void gsd_keybindings_manager_stop (GsdKeybindingsManager *manager);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GSD_KEYBINDINGS_MANAGER_H */
diff --git a/plugins/keybindings/gsd-keybindings-manager.c b/plugins/keybindings/msd-keybindings-manager.c
index 74014cc..c1f876c 100644
--- a/plugins/keybindings/gsd-keybindings-manager.c
+++ b/plugins/keybindings/msd-keybindings-manager.c
@@ -39,15 +39,15 @@
#include <mateconf/mateconf-client.h>
#include "mate-settings-profile.h"
-#include "gsd-keybindings-manager.h"
+#include "msd-keybindings-manager.h"
-#include "gsd-keygrab.h"
+#include "msd-keygrab.h"
#include "eggaccelerators.h"
#define MATECONF_BINDING_DIR "/desktop/mate/keybindings"
#define ALLOWED_KEYS_KEY MATECONF_BINDING_DIR "/allowed_keys"
-#define GSD_KEYBINDINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBINDINGS_MANAGER, GsdKeybindingsManagerPrivate))
+#define MSD_KEYBINDINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_KEYBINDINGS_MANAGER, MsdKeybindingsManagerPrivate))
typedef struct {
char *binding_str;
@@ -57,7 +57,7 @@ typedef struct {
Key previous_key;
} Binding;
-struct GsdKeybindingsManagerPrivate
+struct MsdKeybindingsManagerPrivate
{
GSList *binding_list;
GSList *allowed_keys;
@@ -65,11 +65,11 @@ struct GsdKeybindingsManagerPrivate
guint notify;
};
-static void gsd_keybindings_manager_class_init (GsdKeybindingsManagerClass *klass);
-static void gsd_keybindings_manager_init (GsdKeybindingsManager *keybindings_manager);
-static void gsd_keybindings_manager_finalize (GObject *object);
+static void msd_keybindings_manager_class_init (MsdKeybindingsManagerClass *klass);
+static void msd_keybindings_manager_init (MsdKeybindingsManager *keybindings_manager);
+static void msd_keybindings_manager_finalize (GObject *object);
-G_DEFINE_TYPE (GsdKeybindingsManager, gsd_keybindings_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MsdKeybindingsManager, msd_keybindings_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
@@ -152,7 +152,7 @@ compare_bindings (gconstpointer a,
}
static gboolean
-bindings_get_entry (GsdKeybindingsManager *manager,
+bindings_get_entry (MsdKeybindingsManager *manager,
MateConfClient *client,
const char *subdir)
{
@@ -278,7 +278,7 @@ same_key (const Key *key, const Key *other)
}
static gboolean
-key_already_used (GsdKeybindingsManager *manager,
+key_already_used (MsdKeybindingsManager *manager,
Binding *binding)
{
GSList *li;
@@ -297,7 +297,7 @@ key_already_used (GsdKeybindingsManager *manager,
}
static void
-binding_unregister_keys (GsdKeybindingsManager *manager)
+binding_unregister_keys (MsdKeybindingsManager *manager)
{
GSList *li;
gboolean need_flush = FALSE;
@@ -319,7 +319,7 @@ binding_unregister_keys (GsdKeybindingsManager *manager)
}
static void
-binding_register_keys (GsdKeybindingsManager *manager)
+binding_register_keys (MsdKeybindingsManager *manager)
{
GSList *li;
gboolean need_flush = FALSE;
@@ -448,7 +448,7 @@ get_exec_environment (XEvent *xevent)
static GdkFilterReturn
keybindings_filter (GdkXEvent *gdk_xevent,
GdkEvent *event,
- GsdKeybindingsManager *manager)
+ MsdKeybindingsManager *manager)
{
XEvent *xevent = (XEvent *) gdk_xevent;
GSList *li;
@@ -510,7 +510,7 @@ static void
bindings_callback (MateConfClient *client,
guint cnxn_id,
MateConfEntry *entry,
- GsdKeybindingsManager *manager)
+ MsdKeybindingsManager *manager)
{
char** key_elems;
char* binding_entry;
@@ -541,7 +541,7 @@ bindings_callback (MateConfClient *client,
}
static guint
-register_config_callback (GsdKeybindingsManager *manager,
+register_config_callback (MsdKeybindingsManager *manager,
MateConfClient *client,
const char *path,
MateConfClientNotifyFunc func)
@@ -551,7 +551,7 @@ register_config_callback (GsdKeybindingsManager *manager,
}
gboolean
-gsd_keybindings_manager_start (GsdKeybindingsManager *manager,
+msd_keybindings_manager_start (MsdKeybindingsManager *manager,
GError **error)
{
MateConfClient *client;
@@ -606,9 +606,9 @@ gsd_keybindings_manager_start (GsdKeybindingsManager *manager,
}
void
-gsd_keybindings_manager_stop (GsdKeybindingsManager *manager)
+msd_keybindings_manager_stop (MsdKeybindingsManager *manager)
{
- GsdKeybindingsManagerPrivate *p = manager->priv;
+ MsdKeybindingsManagerPrivate *p = manager->priv;
GSList *l;
g_debug ("Stopping keybindings manager");
@@ -647,14 +647,14 @@ gsd_keybindings_manager_stop (GsdKeybindingsManager *manager)
}
static void
-gsd_keybindings_manager_set_property (GObject *object,
+msd_keybindings_manager_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- GsdKeybindingsManager *self;
+ MsdKeybindingsManager *self;
- self = GSD_KEYBINDINGS_MANAGER (object);
+ self = MSD_KEYBINDINGS_MANAGER (object);
switch (prop_id) {
default:
@@ -664,14 +664,14 @@ gsd_keybindings_manager_set_property (GObject *object,
}
static void
-gsd_keybindings_manager_get_property (GObject *object,
+msd_keybindings_manager_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GsdKeybindingsManager *self;
+ MsdKeybindingsManager *self;
- self = GSD_KEYBINDINGS_MANAGER (object);
+ self = MSD_KEYBINDINGS_MANAGER (object);
switch (prop_id) {
default:
@@ -681,16 +681,16 @@ gsd_keybindings_manager_get_property (GObject *object,
}
static GObject *
-gsd_keybindings_manager_constructor (GType type,
+msd_keybindings_manager_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
- GsdKeybindingsManager *keybindings_manager;
- GsdKeybindingsManagerClass *klass;
+ MsdKeybindingsManager *keybindings_manager;
+ MsdKeybindingsManagerClass *klass;
- klass = GSD_KEYBINDINGS_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_KEYBINDINGS_MANAGER));
+ klass = MSD_KEYBINDINGS_MANAGER_CLASS (g_type_class_peek (MSD_TYPE_KEYBINDINGS_MANAGER));
- keybindings_manager = GSD_KEYBINDINGS_MANAGER (G_OBJECT_CLASS (gsd_keybindings_manager_parent_class)->constructor (type,
+ keybindings_manager = MSD_KEYBINDINGS_MANAGER (G_OBJECT_CLASS (msd_keybindings_manager_parent_class)->constructor (type,
n_construct_properties,
construct_properties));
@@ -698,61 +698,61 @@ gsd_keybindings_manager_constructor (GType type,
}
static void
-gsd_keybindings_manager_dispose (GObject *object)
+msd_keybindings_manager_dispose (GObject *object)
{
- GsdKeybindingsManager *keybindings_manager;
+ MsdKeybindingsManager *keybindings_manager;
- keybindings_manager = GSD_KEYBINDINGS_MANAGER (object);
+ keybindings_manager = MSD_KEYBINDINGS_MANAGER (object);
- G_OBJECT_CLASS (gsd_keybindings_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (msd_keybindings_manager_parent_class)->dispose (object);
}
static void
-gsd_keybindings_manager_class_init (GsdKeybindingsManagerClass *klass)
+msd_keybindings_manager_class_init (MsdKeybindingsManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->get_property = gsd_keybindings_manager_get_property;
- object_class->set_property = gsd_keybindings_manager_set_property;
- object_class->constructor = gsd_keybindings_manager_constructor;
- object_class->dispose = gsd_keybindings_manager_dispose;
- object_class->finalize = gsd_keybindings_manager_finalize;
+ object_class->get_property = msd_keybindings_manager_get_property;
+ object_class->set_property = msd_keybindings_manager_set_property;
+ object_class->constructor = msd_keybindings_manager_constructor;
+ object_class->dispose = msd_keybindings_manager_dispose;
+ object_class->finalize = msd_keybindings_manager_finalize;
- g_type_class_add_private (klass, sizeof (GsdKeybindingsManagerPrivate));
+ g_type_class_add_private (klass, sizeof (MsdKeybindingsManagerPrivate));
}
static void
-gsd_keybindings_manager_init (GsdKeybindingsManager *manager)
+msd_keybindings_manager_init (MsdKeybindingsManager *manager)
{
- manager->priv = GSD_KEYBINDINGS_MANAGER_GET_PRIVATE (manager);
+ manager->priv = MSD_KEYBINDINGS_MANAGER_GET_PRIVATE (manager);
}
static void
-gsd_keybindings_manager_finalize (GObject *object)
+msd_keybindings_manager_finalize (GObject *object)
{
- GsdKeybindingsManager *keybindings_manager;
+ MsdKeybindingsManager *keybindings_manager;
g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_KEYBINDINGS_MANAGER (object));
+ g_return_if_fail (MSD_IS_KEYBINDINGS_MANAGER (object));
- keybindings_manager = GSD_KEYBINDINGS_MANAGER (object);
+ keybindings_manager = MSD_KEYBINDINGS_MANAGER (object);
g_return_if_fail (keybindings_manager->priv != NULL);
- G_OBJECT_CLASS (gsd_keybindings_manager_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_keybindings_manager_parent_class)->finalize (object);
}
-GsdKeybindingsManager *
-gsd_keybindings_manager_new (void)
+MsdKeybindingsManager *
+msd_keybindings_manager_new (void)
{
if (manager_object != NULL) {
g_object_ref (manager_object);
} else {
- manager_object = g_object_new (GSD_TYPE_KEYBINDINGS_MANAGER, NULL);
+ manager_object = g_object_new (MSD_TYPE_KEYBINDINGS_MANAGER, NULL);
g_object_add_weak_pointer (manager_object,
(gpointer *) &manager_object);
}
- return GSD_KEYBINDINGS_MANAGER (manager_object);
+ return MSD_KEYBINDINGS_MANAGER (manager_object);
}
diff --git a/plugins/keybindings/msd-keybindings-manager.h b/plugins/keybindings/msd-keybindings-manager.h
new file mode 100644
index 0000000..95b1bed
--- /dev/null
+++ b/plugins/keybindings/msd-keybindings-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_KEYBINDINGS_MANAGER_H
+#define __MSD_KEYBINDINGS_MANAGER_H
+
+#include <glib-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MSD_TYPE_KEYBINDINGS_MANAGER (msd_keybindings_manager_get_type ())
+#define MSD_KEYBINDINGS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_KEYBINDINGS_MANAGER, MsdKeybindingsManager))
+#define MSD_KEYBINDINGS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_KEYBINDINGS_MANAGER, MsdKeybindingsManagerClass))
+#define MSD_IS_KEYBINDINGS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_KEYBINDINGS_MANAGER))
+#define MSD_IS_KEYBINDINGS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_KEYBINDINGS_MANAGER))
+#define MSD_KEYBINDINGS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_KEYBINDINGS_MANAGER, MsdKeybindingsManagerClass))
+
+typedef struct MsdKeybindingsManagerPrivate MsdKeybindingsManagerPrivate;
+
+typedef struct
+{
+ GObject parent;
+ MsdKeybindingsManagerPrivate *priv;
+} MsdKeybindingsManager;
+
+typedef struct
+{
+ GObjectClass parent_class;
+} MsdKeybindingsManagerClass;
+
+GType msd_keybindings_manager_get_type (void);
+
+MsdKeybindingsManager * msd_keybindings_manager_new (void);
+gboolean msd_keybindings_manager_start (MsdKeybindingsManager *manager,
+ GError **error);
+void msd_keybindings_manager_stop (MsdKeybindingsManager *manager);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSD_KEYBINDINGS_MANAGER_H */
diff --git a/plugins/keybindings/gsd-keybindings-plugin.c b/plugins/keybindings/msd-keybindings-plugin.c
index a96f420..5b0cebb 100644
--- a/plugins/keybindings/gsd-keybindings-plugin.c
+++ b/plugins/keybindings/msd-keybindings-plugin.c
@@ -24,38 +24,38 @@
#include <gmodule.h>
#include "mate-settings-plugin.h"
-#include "gsd-keybindings-plugin.h"
-#include "gsd-keybindings-manager.h"
+#include "msd-keybindings-plugin.h"
+#include "msd-keybindings-manager.h"
-struct GsdKeybindingsPluginPrivate {
- GsdKeybindingsManager *manager;
+struct MsdKeybindingsPluginPrivate {
+ MsdKeybindingsManager *manager;
};
-#define GSD_KEYBINDINGS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_KEYBINDINGS_PLUGIN, GsdKeybindingsPluginPrivate))
+#define MSD_KEYBINDINGS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_KEYBINDINGS_PLUGIN, MsdKeybindingsPluginPrivate))
-MATE_SETTINGS_PLUGIN_REGISTER (GsdKeybindingsPlugin, gsd_keybindings_plugin)
+MATE_SETTINGS_PLUGIN_REGISTER (MsdKeybindingsPlugin, msd_keybindings_plugin)
static void
-gsd_keybindings_plugin_init (GsdKeybindingsPlugin *plugin)
+msd_keybindings_plugin_init (MsdKeybindingsPlugin *plugin)
{
- plugin->priv = GSD_KEYBINDINGS_PLUGIN_GET_PRIVATE (plugin);
+ plugin->priv = MSD_KEYBINDINGS_PLUGIN_GET_PRIVATE (plugin);
- g_debug ("GsdKeybindingsPlugin initializing");
+ g_debug ("MsdKeybindingsPlugin initializing");
- plugin->priv->manager = gsd_keybindings_manager_new ();
+ plugin->priv->manager = msd_keybindings_manager_new ();
}
static void
-gsd_keybindings_plugin_finalize (GObject *object)
+msd_keybindings_plugin_finalize (GObject *object)
{
- GsdKeybindingsPlugin *plugin;
+ MsdKeybindingsPlugin *plugin;
g_return_if_fail (object != NULL);
- g_return_if_fail (GSD_IS_KEYBINDINGS_PLUGIN (object));
+ g_return_if_fail (MSD_IS_KEYBINDINGS_PLUGIN (object));
- g_debug ("GsdKeybindingsPlugin finalizing");
+ g_debug ("MsdKeybindingsPlugin finalizing");
- plugin = GSD_KEYBINDINGS_PLUGIN (object);
+ plugin = MSD_KEYBINDINGS_PLUGIN (object);
g_return_if_fail (plugin->priv != NULL);
@@ -63,7 +63,7 @@ gsd_keybindings_plugin_finalize (GObject *object)
g_object_unref (plugin->priv->manager);
}
- G_OBJECT_CLASS (gsd_keybindings_plugin_parent_class)->finalize (object);
+ G_OBJECT_CLASS (msd_keybindings_plugin_parent_class)->finalize (object);
}
static void
@@ -75,7 +75,7 @@ impl_activate (MateSettingsPlugin *plugin)
g_debug ("Activating keybindings plugin");
error = NULL;
- res = gsd_keybindings_manager_start (GSD_KEYBINDINGS_PLUGIN (plugin)->priv->manager, &error);
+ res = msd_keybindings_manager_start (MSD_KEYBINDINGS_PLUGIN (plugin)->priv->manager, &error);
if (! res) {
g_warning ("Unable to start keybindings manager: %s", error->message);
g_error_free (error);
@@ -86,19 +86,19 @@ static void
impl_deactivate (MateSettingsPlugin *plugin)
{
g_debug ("Deactivating keybindings plugin");
- gsd_keybindings_manager_stop (GSD_KEYBINDINGS_PLUGIN (plugin)->priv->manager);
+ msd_keybindings_manager_stop (MSD_KEYBINDINGS_PLUGIN (plugin)->priv->manager);
}
static void
-gsd_keybindings_plugin_class_init (GsdKeybindingsPluginClass *klass)
+msd_keybindings_plugin_class_init (MsdKeybindingsPluginClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
- object_class->finalize = gsd_keybindings_plugin_finalize;
+ object_class->finalize = msd_keybindings_plugin_finalize;
plugin_class->activate = impl_activate;
plugin_class->deactivate = impl_deactivate;
- g_type_class_add_private (klass, sizeof (GsdKeybindingsPluginPrivate));
+ g_type_class_add_private (klass, sizeof (MsdKeybindingsPluginPrivate));
}
diff --git a/plugins/keybindings/gsd-keybindings-plugin.h b/plugins/keybindings/msd-keybindings-plugin.h
index dea237d..f45d0f8 100644
--- a/plugins/keybindings/gsd-keybindings-plugin.h
+++ b/plugins/keybindings/msd-keybindings-plugin.h
@@ -18,8 +18,8 @@
*
*/
-#ifndef __GSD_KEYBINDINGS_PLUGIN_H__
-#define __GSD_KEYBINDINGS_PLUGIN_H__
+#ifndef __MSD_KEYBINDINGS_PLUGIN_H__
+#define __MSD_KEYBINDINGS_PLUGIN_H__
#include <glib.h>
#include <glib-object.h>
@@ -31,27 +31,27 @@
extern "C" {
#endif
-#define GSD_TYPE_KEYBINDINGS_PLUGIN (gsd_keybindings_plugin_get_type ())
-#define GSD_KEYBINDINGS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_KEYBINDINGS_PLUGIN, GsdKeybindingsPlugin))
-#define GSD_KEYBINDINGS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_KEYBINDINGS_PLUGIN, GsdKeybindingsPluginClass))
-#define GSD_IS_KEYBINDINGS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_KEYBINDINGS_PLUGIN))
-#define GSD_IS_KEYBINDINGS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_KEYBINDINGS_PLUGIN))
-#define GSD_KEYBINDINGS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_KEYBINDINGS_PLUGIN, GsdKeybindingsPluginClass))
+#define MSD_TYPE_KEYBINDINGS_PLUGIN (msd_keybindings_plugin_get_type ())
+#define MSD_KEYBINDINGS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_KEYBINDINGS_PLUGIN, MsdKeybindingsPlugin))
+#define MSD_KEYBINDINGS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_KEYBINDINGS_PLUGIN, MsdKeybindingsPluginClass))
+#define MSD_IS_KEYBINDINGS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_KEYBINDINGS_PLUGIN))
+#define MSD_IS_KEYBINDINGS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_KEYBINDINGS_PLUGIN))
+#define MSD_KEYBINDINGS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_KEYBINDINGS_PLUGIN, MsdKeybindingsPluginClass))
-typedef struct GsdKeybindingsPluginPrivate GsdKeybindingsPluginPrivate;
+typedef struct MsdKeybindingsPluginPrivate MsdKeybindingsPluginPrivate;
typedef struct
{
MateSettingsPlugin parent;
- GsdKeybindingsPluginPrivate *priv;
-} GsdKeybindingsPlugin;
+ MsdKeybindingsPluginPrivate *priv;
+} MsdKeybindingsPlugin;
typedef struct
{
MateSettingsPluginClass parent_class;
-} GsdKeybindingsPluginClass;
+} MsdKeybindingsPluginClass;
-GType gsd_keybindings_plugin_get_type (void) G_GNUC_CONST;
+GType msd_keybindings_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_KEYBINDINGS_PLUGIN_H__ */
+#endif /* __MSD_KEYBINDINGS_PLUGIN_H__ */