[gnome-settings-daemon] main: Remove ability to start/stop individual plugins

From: Bastien Nocera <hadess src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-settings-daemon] main: Remove ability to start/stop individual plugins
Date: Tue, 11 Oct 2016 09:11:34 +0000 (UTC)
commit caf51f50f332aabe7af77f9641ac288dd88af553
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Sep 24 16:27:27 2016 +0200

    main: Remove ability to start/stop individual plugins
    
    All the plugins are now enabled by default, until we use another way to
    start them individually.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772370

 data/gnome-settings-daemon.convert                 |   11 -----
 ...ings-daemon.peripherals.wacom.gschema.xml.in.in |    5 --
 ...settings-daemon.plugins.color.gschema.xml.in.in |    5 --
 ...tings-daemon.plugins.datetime.gschema.xml.in.in |    5 --
 ...gnome.settings-daemon.plugins.gschema.xml.in.in |   41 --------------------
 ...s-daemon.plugins.housekeeping.gschema.xml.in.in |    5 --
 ...tings-daemon.plugins.keyboard.gschema.xml.in.in |    5 --
 ...ngs-daemon.plugins.media-keys.gschema.xml.in.in |    5 --
 ...gs-daemon.plugins.orientation.gschema.xml.in.in |    5 --
 ...settings-daemon.plugins.power.gschema.xml.in.in |    5 --
 ...n.plugins.print-notifications.gschema.xml.in.in |    5 --
 ...ttings-daemon.plugins.sharing.gschema.xml.in.in |    5 --
 ...ettings-daemon.plugins.xrandr.gschema.xml.in.in |    5 --
 ...ings-daemon.plugins.xsettings.gschema.xml.in.in |    5 --
 gnome-settings-daemon/gnome-settings-manager.c     |   22 ++++-------
 gnome-settings-daemon/gnome-settings-plugin-info.c |   28 -------------
 gnome-settings-daemon/gnome-settings-plugin-info.h |    1 -
 17 files changed, 8 insertions(+), 155 deletions(-)
---
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index b86da03..c78572b 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -11,19 +11,15 @@ motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
 
 [org.gnome.settings-daemon.plugins.a11y-keyboard]
-active = /apps/gnome_settings_daemon/plugins/a11y-keyboard/active
 priority = /apps/gnome_settings_daemon/plugins/a11y-keyboard/priority
 
 [org.gnome.settings-daemon.plugins.clipboard]
-active = /apps/gnome_settings_daemon/plugins/clipboard/active
 priority = /apps/gnome_settings_daemon/plugins/clipboard/priority
 
 [org.gnome.settings-daemon.plugins.font]
-active = /apps/gnome_settings_daemon/plugins/font/active
 priority = /apps/gnome_settings_daemon/plugins/font/priority
 
 [org.gnome.settings-daemon.plugins.housekeeping]
-active = /apps/gnome_settings_daemon/plugins/housekeeping/active
 free-percent-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify
 free-percent-notify-again = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again
 free-size-gb-no-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_size_gb_no_notify
@@ -32,11 +28,9 @@ min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_
 priority = /apps/gnome_settings_daemon/plugins/housekeeping/priority
 
 [org.gnome.settings-daemon.plugins.keyboard]
-active = /apps/gnome_settings_daemon/plugins/keyboard/active
 priority = /apps/gnome_settings_daemon/plugins/keyboard/priority
 
 [org.gnome.settings-daemon.plugins.media-keys]
-active = /apps/gnome_settings_daemon/plugins/keybindings/active
 calculator = /apps/gnome_settings_daemon/keybindings/calculator
 email = /apps/gnome_settings_daemon/keybindings/email
 eject = /apps/gnome_settings_daemon/keybindings/eject
@@ -59,7 +53,6 @@ volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
 www = /apps/gnome_settings_daemon/keybindings/www
 
 [org.gnome.settings-daemon.plugins.mouse]
-active = /apps/gnome_settings_daemon/plugins/mouse/active
 priority = /apps/gnome_settings_daemon/plugins/mouse/priority
 
 [org.gnome.settings-daemon.peripherals.mouse]
@@ -71,20 +64,16 @@ motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
 
 [org.gnome.settings-daemon.plugins.smartcard]
-active = /apps/gnome_settings_daemon/plugins/smartcard/active
 priority = /apps/gnome_settings_daemon/plugins/smartcard/priority
 
 [org.gnome.settings-daemon.plugins.sound]
-active = /apps/gnome_settings_daemon/plugins/sound/active
 priority = /apps/gnome_settings_daemon/plugins/sound/priority
 
 [org.gnome.settings-daemon.plugins.xrandr]
-active = /apps/gnome_settings_daemon/plugins/xrandr/active
 default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
 priority = /apps/gnome_settings_daemon/plugins/xrandr/priority
 
 [org.gnome.settings-daemon.plugins.xsettings]
-active = /apps/gnome_settings_daemon/plugins/xsettings/active
 antialiasing = /desktop/gnome/font_rendering/antialiasing
 hinting = /desktop/gnome/font_rendering/hinting
 priority = /apps/gnome_settings_daemon/plugins/xsettings/priority
diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
index 083913a..946d4ae 100644
--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.gsdwacom" 
path="/org/gnome/settings-daemon/plugins/gsdwacom/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
index e5bf62c..5631151 100644
--- a/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.color" 
path="/org/gnome/settings-daemon/plugins/color/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
index eacc4a0..43d5cd5 100644
--- a/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.datetime" 
path="/org/gnome/settings-daemon/plugins/datetime/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index bdfcfcd..b87f9af 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -5,7 +5,6 @@
       <_summary>List of plugins that are allowed to be loaded</_summary>
       <_description>
         A list of strings representing the plugins that are allowed to be loaded (default: 'all').
-        The plugins still need to be marked as active to get loaded.
         This is only evaluated on startup.
       </_description>
     </key>
@@ -30,11 +29,6 @@
     <child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.a11y-keyboard" 
path="/org/gnome/settings-daemon/plugins/a11y-keyboard/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -42,11 +36,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.a11y-settings" 
path="/org/gnome/settings-daemon/plugins/a11y-settings/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -54,11 +43,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard" 
path="/org/gnome/settings-daemon/plugins/clipboard/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -66,11 +50,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.mouse" 
path="/org/gnome/settings-daemon/plugins/mouse/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -78,11 +57,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.rfkill" 
path="/org/gnome/settings-daemon/plugins/rfkill/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -90,11 +64,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.screensaver-proxy" 
path="/org/gnome/settings-daemon/plugins/screensaver-proxy/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -102,11 +71,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.smartcard" 
path="/org/gnome/settings-daemon/plugins/smartcard/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
@@ -114,11 +78,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sound" 
path="/org/gnome/settings-daemon/plugins/sound/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
index 1e37592..3747adf 100644
--- a/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.housekeeping" 
path="/org/gnome/settings-daemon/plugins/housekeeping/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="ignore-paths" type="as">
       <default>[]</default>
       <_summary>Mount paths to ignore</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
index c086778..c859e73 100644
--- a/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.keyboard" 
path="/org/gnome/settings-daemon/plugins/keyboard/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
index aa8760c..cc58d12 100644
--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.media-keys" 
path="/org/gnome/settings-daemon/plugins/media-keys/">
-     <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="custom-keybindings" type="as">
       <default>[]</default>
       <_summary>Custom keybindings</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
index 7bfa5d5..a46fbd0 100644
--- a/data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.orientation" 
path="/org/gnome/settings-daemon/plugins/orientation/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
index 92ab9e9..2708138 100644
--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.power" 
path="/org/gnome/settings-daemon/plugins/power/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
index 6b5f579..06f4a74 100644
--- a/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.print-notifications" 
path="/org/gnome/settings-daemon/plugins/print-notifications/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
index 0668b66..c501c36 100644
--- a/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sharing" 
path="/org/gnome/settings-daemon/plugins/sharing/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="priority" type="i">
       <default>0</default>
       <_summary>Priority to use for this plugin</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
index db24e99..374e083 100644
--- a/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xrandr" 
path="/org/gnome/settings-daemon/plugins/xrandr/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="default-configuration-file" type="s">
       <default>'/etc/gnome-settings-daemon/xrandr/monitors.xml'</default>
       <_summary>File for default configuration for RandR</_summary>
diff --git a/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
index 0e6700c..6f9e0a1 100644
--- a/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
@@ -1,10 +1,5 @@
 <schemalist>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xsettings" 
path="/org/gnome/settings-daemon/plugins/xsettings/">
-    <key name="active" type="b">
-      <default>true</default>
-      <_summary>Activation of this plugin</_summary>
-      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
-    </key>
     <key name="antialiasing" enum="org.gnome.settings-daemon.GsdFontAntialiasingMode">
       <default>'grayscale'</default>
       <_summary>Antialiasing</_summary>
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 07fff29..4634463 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -89,18 +89,14 @@ gnome_settings_manager_error_quark (void)
 }
 
 static void
-maybe_activate_plugin (GnomeSettingsPluginInfo *info, gpointer user_data)
+activate_plugin (GnomeSettingsPluginInfo *info, gpointer user_data)
 {
-        if (gnome_settings_plugin_info_get_enabled (info)) {
-                gboolean res;
-                res = gnome_settings_plugin_info_activate (info);
-                if (res) {
-                        g_debug ("Plugin %s: active", gnome_settings_plugin_info_get_location (info));
-                } else {
-                        g_debug ("Plugin %s: activation failed", gnome_settings_plugin_info_get_location 
(info));
-                }
+        gboolean res;
+        res = gnome_settings_plugin_info_activate (info);
+        if (res) {
+                g_debug ("Plugin %s: active", gnome_settings_plugin_info_get_location (info));
         } else {
-                g_debug ("Plugin %s: inactive", gnome_settings_plugin_info_get_location (info));
+                g_debug ("Plugin %s: activation failed", gnome_settings_plugin_info_get_location (info));
         }
 }
 
@@ -323,16 +319,14 @@ _load_all (GnomeSettingsManager *manager)
         _load_dir (manager, GNOME_SETTINGS_PLUGINDIR G_DIR_SEPARATOR_S);
 
         manager->priv->plugins = g_slist_sort (manager->priv->plugins, (GCompareFunc) compare_priority);
-        g_slist_foreach (manager->priv->plugins, (GFunc) maybe_activate_plugin, NULL);
+        g_slist_foreach (manager->priv->plugins, (GFunc) activate_plugin, NULL);
         gnome_settings_profile_end (NULL);
 }
 
 static void
 _unload_plugin (GnomeSettingsPluginInfo *info, gpointer user_data)
 {
-        if (gnome_settings_plugin_info_get_enabled (info)) {
-                gnome_settings_plugin_info_deactivate (info);
-        }
+        gnome_settings_plugin_info_deactivate (info);
         g_object_unref (info);
 }
 
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.c 
b/gnome-settings-daemon/gnome-settings-plugin-info.c
index 9d2bb34..51d0379 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.c
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.c
@@ -53,7 +53,6 @@ struct GnomeSettingsPluginInfoPrivate
 
         GnomeSettingsPlugin     *plugin;
 
-        int                      enabled : 1;
         int                      active : 1;
 
         /* A plugin is unavailable if it is not possible to activate it
@@ -281,19 +280,6 @@ gnome_settings_plugin_info_new_from_file (const char *filename)
         return info;
 }
 
-static void
-plugin_enabled_cb (GSettings               *settings,
-                   const gchar             *key,
-                   GnomeSettingsPluginInfo *info)
-{
-        if (g_strcmp0 (key, "active") == 0) {
-                if (g_settings_get_boolean (settings, "active"))
-                        gnome_settings_plugin_info_activate (info);
-                else
-                        gnome_settings_plugin_info_deactivate (info);
-        }
-}
-
 void
 gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info,
                                                 const char              *settings_prefix)
@@ -301,16 +287,10 @@ gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info,
         int priority;
 
         info->priv->settings = g_settings_new (settings_prefix);
-        info->priv->enabled = g_settings_get_boolean (info->priv->settings, "active");
 
         priority = g_settings_get_int (info->priv->settings, "priority");
         if (priority > 0)
                 info->priv->priority = priority;
-
-        g_signal_connect (G_OBJECT (info->priv->settings),
-                          "changed",
-                          G_CALLBACK (plugin_enabled_cb),
-                          info);
 }
 
 static void
@@ -443,14 +423,6 @@ gnome_settings_plugin_info_is_active (GnomeSettingsPluginInfo *info)
 }
 
 gboolean
-gnome_settings_plugin_info_get_enabled (GnomeSettingsPluginInfo *info)
-{
-        g_return_val_if_fail (GNOME_IS_SETTINGS_PLUGIN_INFO (info), FALSE);
-
-        return (info->priv->enabled);
-}
-
-gboolean
 gnome_settings_plugin_info_is_available (GnomeSettingsPluginInfo *info)
 {
         g_return_val_if_fail (GNOME_IS_SETTINGS_PLUGIN_INFO (info), FALSE);
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.h 
b/gnome-settings-daemon/gnome-settings-plugin-info.h
index ddea378..8dd024f 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.h
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.h
@@ -55,7 +55,6 @@ gboolean         gnome_settings_plugin_info_activate        (GnomeSettingsPlugin
 gboolean         gnome_settings_plugin_info_deactivate      (GnomeSettingsPluginInfo *info);
 
 gboolean         gnome_settings_plugin_info_is_active       (GnomeSettingsPluginInfo *info);
-gboolean         gnome_settings_plugin_info_get_enabled     (GnomeSettingsPluginInfo *info);
 gboolean         gnome_settings_plugin_info_is_available    (GnomeSettingsPluginInfo *info);
 
 const char      *gnome_settings_plugin_info_get_name        (GnomeSettingsPluginInfo *info);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]