summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnome-settings-daemon/Makefile.am6
-rw-r--r--gnome-settings-daemon/gnome-settings-plugin.c59
-rw-r--r--gnome-settings-daemon/gnome-settings-plugin.h152
-rw-r--r--plugins/color/gsd-color-manager.c1
-rw-r--r--plugins/color/gsd-color-state.c5
-rw-r--r--plugins/media-keys/gsd-media-keys-manager.c5
-rw-r--r--plugins/orientation/gsd-orientation-manager.c5
-rw-r--r--plugins/power/gsd-power-manager.c5
-rw-r--r--plugins/rfkill/gsd-rfkill-manager.c5
-rw-r--r--plugins/sharing/gsd-sharing-manager.c5
-rw-r--r--plugins/smartcard/gsd-smartcard-manager.c1
-rw-r--r--plugins/smartcard/gsd-smartcard-service.c6
-rw-r--r--plugins/wacom/gsd-wacom-manager.c5
-rw-r--r--plugins/xrandr/gsd-xrandr-manager.c5
14 files changed, 36 insertions, 229 deletions
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index db0ec374..2fac5e56 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -88,12 +88,6 @@ EXTRA_DIST = \
org.gnome.Shell.xml \
$(NULL)
-apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
-api_DATA = \
- gnome-settings-plugin.h
-
-EXTRA_DIST += $(api_DATA)
-
CLEANFILES = $(gsd_SCRIPTS)
# vim: ts=8
diff --git a/gnome-settings-daemon/gnome-settings-plugin.c b/gnome-settings-daemon/gnome-settings-plugin.c
deleted file mode 100644
index 8d0e6fd2..00000000
--- a/gnome-settings-daemon/gnome-settings-plugin.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2002-2005 Paolo Maggi
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gnome-settings-plugin.h"
-
-G_DEFINE_TYPE (GnomeSettingsPlugin, gnome_settings_plugin, G_TYPE_OBJECT)
-
-static void
-dummy (GnomeSettingsPlugin *plugin)
-{
- /* Empty */
-}
-
-static void
-gnome_settings_plugin_class_init (GnomeSettingsPluginClass *klass)
-{
- klass->activate = dummy;
- klass->deactivate = dummy;
-}
-
-static void
-gnome_settings_plugin_init (GnomeSettingsPlugin *plugin)
-{
- /* Empty */
-}
-
-void
-gnome_settings_plugin_activate (GnomeSettingsPlugin *plugin)
-{
- g_return_if_fail (GNOME_IS_SETTINGS_PLUGIN (plugin));
-
- GNOME_SETTINGS_PLUGIN_GET_CLASS (plugin)->activate (plugin);
-}
-
-void
-gnome_settings_plugin_deactivate (GnomeSettingsPlugin *plugin)
-{
- g_return_if_fail (GNOME_IS_SETTINGS_PLUGIN (plugin));
-
- GNOME_SETTINGS_PLUGIN_GET_CLASS (plugin)->deactivate (plugin);
-}
diff --git a/gnome-settings-daemon/gnome-settings-plugin.h b/gnome-settings-daemon/gnome-settings-plugin.h
deleted file mode 100644
index 1c505ce5..00000000
--- a/gnome-settings-daemon/gnome-settings-plugin.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2002-2005 Paolo Maggi
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GNOME_SETTINGS_PLUGIN_H__
-#define __GNOME_SETTINGS_PLUGIN_H__
-
-#include <glib-object.h>
-#include <gmodule.h>
-
-G_BEGIN_DECLS
-#define GNOME_TYPE_SETTINGS_PLUGIN (gnome_settings_plugin_get_type())
-#define GNOME_SETTINGS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_TYPE_SETTINGS_PLUGIN, GnomeSettingsPlugin))
-#define GNOME_SETTINGS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNOME_TYPE_SETTINGS_PLUGIN, GnomeSettingsPluginClass))
-#define GNOME_IS_SETTINGS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNOME_TYPE_SETTINGS_PLUGIN))
-#define GNOME_IS_SETTINGS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SETTINGS_PLUGIN))
-#define GNOME_SETTINGS_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNOME_TYPE_SETTINGS_PLUGIN, GnomeSettingsPluginClass))
-
-typedef struct
-{
- GObject parent;
-} GnomeSettingsPlugin;
-
-typedef struct
-{
- GObjectClass parent_class;
-
- /* Virtual public methods */
- void (*activate) (GnomeSettingsPlugin *plugin);
- void (*deactivate) (GnomeSettingsPlugin *plugin);
-} GnomeSettingsPluginClass;
-
-GType gnome_settings_plugin_get_type (void) G_GNUC_CONST;
-
-void gnome_settings_plugin_activate (GnomeSettingsPlugin *plugin);
-void gnome_settings_plugin_deactivate (GnomeSettingsPlugin *plugin);
-
-#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
-#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
-#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
-
-/*
- * Utility macro used to register plugins
- *
- * use: GNOME_SETTINGS_PLUGIN_REGISTER (PluginName, plugin_name)
- */
-#define GNOME_SETTINGS_PLUGIN_REGISTER(PluginName, plugin_name) \
-typedef struct { \
- PluginName##Manager *manager; \
-} PluginName##PluginPrivate; \
-typedef struct { \
- GnomeSettingsPlugin parent; \
- PluginName##PluginPrivate *priv; \
-} PluginName##Plugin; \
-typedef struct { \
- GnomeSettingsPluginClass parent_class; \
-} PluginName##PluginClass; \
-GType plugin_name##_plugin_get_type (void) G_GNUC_CONST; \
-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); \
- \
- G_DEFINE_DYNAMIC_TYPE (PluginName##Plugin, \
- plugin_name##_plugin, \
- GNOME_TYPE_SETTINGS_PLUGIN) \
- \
-G_MODULE_EXPORT GType \
-register_gnome_settings_plugin (GTypeModule *type_module) \
-{ \
- plugin_name##_plugin_register_type (type_module); \
- \
- return plugin_name##_plugin_get_type(); \
-} \
- \
-static void \
-plugin_name##_plugin_class_finalize (PluginName##PluginClass * plugin_name##_class) \
-{ \
-} \
- \
-static void \
-plugin_name##_plugin_init (PluginName##Plugin *plugin) \
-{ \
- plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE ((plugin), \
- plugin_name##_plugin_get_type(), PluginName##PluginPrivate); \
- g_debug (#PluginName " initializing"); \
- plugin->priv->manager = plugin_name##_manager_new (); \
-} \
- \
-static void \
-plugin_name##_plugin_finalize (GObject *object) \
-{ \
- PluginName##Plugin *plugin; \
- g_return_if_fail (object != NULL); \
- g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (object, plugin_name##_plugin_get_type())); \
- g_debug ("PluginName## finalizing"); \
- plugin = G_TYPE_CHECK_INSTANCE_CAST ((object), plugin_name##_plugin_get_type(), PluginName##Plugin); \
- g_return_if_fail (plugin->priv != NULL); \
- if (plugin->priv->manager != NULL) \
- g_object_unref (plugin->priv->manager); \
- G_OBJECT_CLASS (plugin_name##_plugin_parent_class)->finalize (object); \
-} \
- \
-static void \
-impl_activate (GnomeSettingsPlugin *plugin) \
-{ \
- GError *error = NULL; \
- PluginName##Plugin *plugin_cast; \
- g_debug ("Activating %s plugin", G_STRINGIFY(plugin_name)); \
- plugin_cast = G_TYPE_CHECK_INSTANCE_CAST ((plugin), plugin_name##_plugin_get_type(), PluginName##Plugin); \
- if (!plugin_name##_manager_start (plugin_cast->priv->manager, &error)) { \
- g_warning ("Unable to start %s manager: %s", G_STRINGIFY(plugin_name), error ? error->message : "No reason"); \
- g_clear_error (&error); \
- } \
-} \
- \
-static void \
-impl_deactivate (GnomeSettingsPlugin *plugin) \
-{ \
- PluginName##Plugin *plugin_cast; \
- plugin_cast = G_TYPE_CHECK_INSTANCE_CAST ((plugin), plugin_name##_plugin_get_type(), PluginName##Plugin); \
- g_debug ("Deactivating %s plugin", G_STRINGIFY (plugin_name)); \
- plugin_name##_manager_stop (plugin_cast->priv->manager); \
-} \
- \
-static void \
-plugin_name##_plugin_class_init (PluginName##PluginClass *klass) \
-{ \
- GObjectClass *object_class = G_OBJECT_CLASS (klass); \
- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); \
- \
- object_class->finalize = plugin_name##_plugin_finalize; \
- plugin_class->activate = impl_activate; \
- plugin_class->deactivate = impl_deactivate; \
- g_type_class_add_private (klass, sizeof (PluginName##PluginPrivate)); \
-}
-
-G_END_DECLS
-
-#endif /* __GNOME_SETTINGS_PLUGIN_H__ */
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
index ae1bc0df..2cf72d27 100644
--- a/plugins/color/gsd-color-manager.c
+++ b/plugins/color/gsd-color-manager.c
@@ -23,7 +23,6 @@
#include <glib/gi18n.h>
#include <gdk/gdk.h>
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gsd-color-calibrate.h"
#include "gsd-color-manager.h"
diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
index 9f8308f8..4202d95b 100644
--- a/plugins/color/gsd-color-state.c
+++ b/plugins/color/gsd-color-state.c
@@ -35,7 +35,6 @@
#endif
#include "gnome-settings-bus.h"
-#include "gnome-settings-plugin.h"
#include "gsd-color-manager.h"
#include "gsd-color-state.h"
@@ -43,6 +42,10 @@
#define GSD_COLOR_STATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_COLOR_STATE, GsdColorStatePrivate))
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
struct GsdColorStatePrivate
{
GCancellable *cancellable;
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index d77ed10a..aec094bb 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -47,7 +47,6 @@
#endif
#include "mpris-controller.h"
-#include "gnome-settings-plugin.h"
#include "gnome-settings-bus.h"
#include "gnome-settings-profile.h"
#include "gsd-marshal.h"
@@ -65,6 +64,10 @@
#include "gvc-mixer-control.h"
#include "gvc-mixer-sink.h"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_MEDIA_KEYS_DBUS_PATH GSD_DBUS_PATH "/MediaKeys"
#define GSD_MEDIA_KEYS_DBUS_NAME GSD_DBUS_NAME ".MediaKeys"
diff --git a/plugins/orientation/gsd-orientation-manager.c b/plugins/orientation/gsd-orientation-manager.c
index 6318491e..8cd15c91 100644
--- a/plugins/orientation/gsd-orientation-manager.c
+++ b/plugins/orientation/gsd-orientation-manager.c
@@ -28,10 +28,13 @@
#include <libgnome-desktop/gnome-rr.h>
#include "gsd-input-helper.h"
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gsd-orientation-manager.h"
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
typedef enum {
ORIENTATION_UNDEFINED,
ORIENTATION_NORMAL,
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 8196789e..5db92f47 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -44,12 +44,15 @@
#include "gsm-presence-flag.h"
#include "gsm-manager-logout-mode.h"
#include "gpm-common.h"
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gnome-settings-bus.h"
#include "gsd-enums.h"
#include "gsd-power-manager.h"
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define UPOWER_DBUS_NAME "org.freedesktop.UPower"
#define UPOWER_DBUS_PATH "/org/freedesktop/UPower"
#define UPOWER_DBUS_PATH_KBDBACKLIGHT "/org/freedesktop/UPower/KbdBacklight"
diff --git a/plugins/rfkill/gsd-rfkill-manager.c b/plugins/rfkill/gsd-rfkill-manager.c
index 87de49ec..2683b8b1 100644
--- a/plugins/rfkill/gsd-rfkill-manager.c
+++ b/plugins/rfkill/gsd-rfkill-manager.c
@@ -25,7 +25,6 @@
#include <gio/gio.h>
#include <string.h>
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gsd-rfkill-manager.h"
#include "rfkill-glib.h"
@@ -60,6 +59,10 @@ struct GsdRfkillManagerPrivate
gchar *chassis_type;
};
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_RFKILL_DBUS_NAME GSD_DBUS_NAME ".Rfkill"
#define GSD_RFKILL_DBUS_PATH GSD_DBUS_PATH "/Rfkill"
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
index cd637c44..b2b60869 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -29,7 +29,6 @@
#include <NetworkManager.h>
#endif /* HAVE_NETWORK_MANAGER */
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gsd-sharing-manager.h"
#include "gsd-sharing-enums.h"
@@ -60,6 +59,10 @@ struct GsdSharingManagerPrivate
GsdSharingStatus sharing_status;
};
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_SHARING_DBUS_NAME GSD_DBUS_NAME ".Sharing"
#define GSD_SHARING_DBUS_PATH GSD_DBUS_PATH "/Sharing"
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index 53009659..ba9f27f3 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -23,7 +23,6 @@
#include <glib.h>
#include <gio/gio.h>
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gnome-settings-bus.h"
#include "gsd-smartcard-manager.h"
diff --git a/plugins/smartcard/gsd-smartcard-service.c b/plugins/smartcard/gsd-smartcard-service.c
index 24982a27..0710334b 100644
--- a/plugins/smartcard/gsd-smartcard-service.c
+++ b/plugins/smartcard/gsd-smartcard-service.c
@@ -26,8 +26,6 @@
#include "gsd-smartcard-enum-types.h"
#include "gsd-smartcard-utils.h"
-#include "gnome-settings-plugin.h"
-
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
@@ -43,6 +41,10 @@ struct _GsdSmartcardServicePrivate
guint name_id;
};
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_SMARTCARD_DBUS_NAME GSD_DBUS_NAME ".Smartcard"
#define GSD_SMARTCARD_DBUS_PATH GSD_DBUS_PATH "/Smartcard"
#define GSD_SMARTCARD_MANAGER_DBUS_PATH GSD_SMARTCARD_DBUS_PATH "/Manager"
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 9ddfd739..0fb08784 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -45,7 +45,6 @@
#include "gsd-enums.h"
#include "gsd-input-helper.h"
#include "gsd-keygrab.h"
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gnome-settings-bus.h"
#include "gsd-wacom-manager.h"
@@ -81,6 +80,10 @@
#define UNKNOWN_DEVICE_NOTIFICATION_TIMEOUT 15000
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_WACOM_DBUS_PATH GSD_DBUS_PATH "/Wacom"
#define GSD_WACOM_DBUS_NAME GSD_DBUS_NAME ".Wacom"
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 33d1ed14..06906a96 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -46,7 +46,6 @@
#include "gsd-enums.h"
#include "gsd-input-helper.h"
-#include "gnome-settings-plugin.h"
#include "gnome-settings-profile.h"
#include "gnome-settings-bus.h"
#include "gsd-device-mapper.h"
@@ -65,6 +64,10 @@
/* name of the icon files (gsd-xrandr.svg, etc.) */
#define GSD_XRANDR_ICON_NAME "gsd-xrandr"
+#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
+#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
+#define GSD_DBUS_BASE_INTERFACE "org.gnome.SettingsDaemon"
+
#define GSD_XRANDR_DBUS_NAME GSD_DBUS_NAME ".XRANDR"
#define GSD_XRANDR_DBUS_PATH GSD_DBUS_PATH "/XRANDR"
View Lorry Controller Status