diff options
author | Bastien Nocera <hadess@hadess.net> | 2016-09-29 14:07:34 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2016-10-11 11:00:57 +0200 |
commit | 9399e3d967b57a0a51f5571280001dc185548f88 (patch) | |
tree | ddd4fcab34f85de21b73978db0067d4acd16cf53 /gnome-settings-daemon | |
parent | 51121e0791be86f64c812356c57f09c6394ce9b4 (diff) | |
download | gnome-settings-daemon-9399e3d967b57a0a51f5571280001dc185548f88.tar.gz |
main: Remove gnome-settings-plugin.h
The plugin system is not used any more, and wasn't dist'ed, which broke
building from tarballs.
https://bugzilla.gnome.org/show_bug.cgi?id=772370
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r-- | gnome-settings-daemon/Makefile.am | 6 | ||||
-rw-r--r-- | gnome-settings-daemon/gnome-settings-plugin.c | 59 | ||||
-rw-r--r-- | gnome-settings-daemon/gnome-settings-plugin.h | 152 |
3 files changed, 0 insertions, 217 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__ */ |