[gnome-settings-daemon] main: Remove GSettings override for plugin priority
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] main: Remove GSettings override for plugin priority
- Date: Tue, 11 Oct 2016 09:11:39 +0000 (UTC)
commit 8db4f84c2a1a7d5dd1a1168d6ba345da2985be8e
Author: Bastien Nocera <hadess hadess net>
Date: Sat Sep 24 16:51:12 2016 +0200
main: Remove GSettings override for plugin priority
There's a default value already available in the plugin file itself.
https://bugzilla.gnome.org/show_bug.cgi?id=772370
configure.ac | 4 -
data/Makefile.am | 4 -
data/gnome-settings-daemon.convert | 25 -------
...ings-daemon.peripherals.wacom.gschema.xml.in.in | 7 --
...settings-daemon.plugins.color.gschema.xml.in.in | 5 --
...tings-daemon.plugins.datetime.gschema.xml.in.in | 9 ---
...gnome.settings-daemon.plugins.gschema.xml.in.in | 69 --------------------
...s-daemon.plugins.housekeeping.gschema.xml.in.in | 5 --
...tings-daemon.plugins.keyboard.gschema.xml.in.in | 9 ---
...ngs-daemon.plugins.media-keys.gschema.xml.in.in | 5 --
...gs-daemon.plugins.orientation.gschema.xml.in.in | 9 ---
...settings-daemon.plugins.power.gschema.xml.in.in | 5 --
...n.plugins.print-notifications.gschema.xml.in.in | 9 ---
...ttings-daemon.plugins.sharing.gschema.xml.in.in | 8 --
...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 | 41 ++----------
gnome-settings-daemon/gnome-settings-plugin-info.c | 22 ------
gnome-settings-daemon/gnome-settings-plugin-info.h | 4 -
po/POTFILES.in | 4 -
po/POTFILES.skip | 4 -
21 files changed, 6 insertions(+), 252 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8bb3a02..2ab6219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,18 +541,14 @@ data/gnome-settings-daemon.pc
data/gnome-settings-daemon-uninstalled.pc
data/org.gnome.settings-daemon.plugins.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.gschema.xml.in
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
po/Makefile.in
man/Makefile
tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 75e796e..c9d27dc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,17 +9,13 @@ gsettings_ENUM_FILES = $(top_srcdir)/data/$(api_DATA)
gsettings_SCHEMAS = \
org.gnome.settings-daemon.peripherals.gschema.xml \
org.gnome.settings-daemon.plugins.gschema.xml \
- org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
org.gnome.settings-daemon.plugins.power.gschema.xml \
org.gnome.settings-daemon.plugins.color.gschema.xml \
- org.gnome.settings-daemon.plugins.datetime.gschema.xml \
org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
org.gnome.settings-daemon.plugins.sharing.gschema.xml \
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
- org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
- org.gnome.settings-daemon.plugins.orientation.gschema.xml \
org.gnome.settings-daemon.peripherals.wacom.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index c78572b..8b0e09d 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -10,25 +10,12 @@ touchpad-enabled = /desktop/gnome/peripherals/touchpad/touchpad_enabled
motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
-[org.gnome.settings-daemon.plugins.a11y-keyboard]
-priority = /apps/gnome_settings_daemon/plugins/a11y-keyboard/priority
-
-[org.gnome.settings-daemon.plugins.clipboard]
-priority = /apps/gnome_settings_daemon/plugins/clipboard/priority
-
-[org.gnome.settings-daemon.plugins.font]
-priority = /apps/gnome_settings_daemon/plugins/font/priority
-
[org.gnome.settings-daemon.plugins.housekeeping]
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
ignore-paths = /apps/gnome_settings_daemon/plugins/housekeeping/ignore_paths
min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_period
-priority = /apps/gnome_settings_daemon/plugins/housekeeping/priority
-
-[org.gnome.settings-daemon.plugins.keyboard]
-priority = /apps/gnome_settings_daemon/plugins/keyboard/priority
[org.gnome.settings-daemon.plugins.media-keys]
calculator = /apps/gnome_settings_daemon/keybindings/calculator
@@ -42,7 +29,6 @@ next = /apps/gnome_settings_daemon/keybindings/next
pause = /apps/gnome_settings_daemon/keybindings/pause
play = /apps/gnome_settings_daemon/keybindings/play
previous = /apps/gnome_settings_daemon/keybindings/previous
-priority = /apps/gnome_settings_daemon/plugins/keybindings/priority
screensaver = /apps/gnome_settings_daemon/keybindings/screensaver
search = /apps/gnome_settings_daemon/keybindings/search
stop = /apps/gnome_settings_daemon/keybindings/stop
@@ -52,9 +38,6 @@ volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
www = /apps/gnome_settings_daemon/keybindings/www
-[org.gnome.settings-daemon.plugins.mouse]
-priority = /apps/gnome_settings_daemon/plugins/mouse/priority
-
[org.gnome.settings-daemon.peripherals.mouse]
locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
double-click = /desktop/gnome/peripherals/mouse/double_click
@@ -63,18 +46,10 @@ left-handed = /desktop/gnome/peripherals/mouse/left_handed
motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
-[org.gnome.settings-daemon.plugins.smartcard]
-priority = /apps/gnome_settings_daemon/plugins/smartcard/priority
-
-[org.gnome.settings-daemon.plugins.sound]
-priority = /apps/gnome_settings_daemon/plugins/sound/priority
-
[org.gnome.settings-daemon.plugins.xrandr]
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]
antialiasing = /desktop/gnome/font_rendering/antialiasing
hinting = /desktop/gnome/font_rendering/hinting
-priority = /apps/gnome_settings_daemon/plugins/xsettings/priority
rgba-order = /desktop/gnome/font_rendering/rgba_order
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 946d4ae..aae6f31 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,11 +1,4 @@
<schemalist>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.gsdwacom"
path="/org/gnome/settings-daemon/plugins/gsdwacom/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.wacom">
<child name="stylus" schema="org.gnome.settings-daemon.peripherals.wacom.stylus"/>
<child name="eraser" schema="org.gnome.settings-daemon.peripherals.wacom.eraser"/>
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 5631151..3df07c7 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="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
<key name="recalibrate-display-threshold" type="u">
<default>0</default>
<_summary>The duration a display profile is valid</_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 b87f9af..fffc11c 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -8,80 +8,11 @@
This is only evaluated on startup.
</_description>
</key>
- <child name="a11y-keyboard" schema="org.gnome.settings-daemon.plugins.a11y-keyboard"/>
- <child name="a11y-settings" schema="org.gnome.settings-daemon.plugins.a11y-settings"/>
- <child name="clipboard" schema="org.gnome.settings-daemon.plugins.clipboard"/>
<child name="color" schema="org.gnome.settings-daemon.plugins.color"/>
- <child name="datetime" schema="org.gnome.settings-daemon.plugins.datetime"/>
- <child name="gsdwacom" schema="org.gnome.settings-daemon.plugins.gsdwacom"/>
<child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
- <child name="keyboard" schema="org.gnome.settings-daemon.plugins.keyboard"/>
<child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
- <child name="mouse" schema="org.gnome.settings-daemon.plugins.mouse"/>
- <child name="orientation" schema="org.gnome.settings-daemon.plugins.orientation"/>
<child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
- <child name="print-notifications" schema="org.gnome.settings-daemon.plugins.print-notifications"/>
- <child name="screensaver-proxy" schema="org.gnome.settings-daemon.plugins.screensaver-proxy"/>
- <child name="sharing" schema="org.gnome.settings-daemon.plugins.sharing"/>
- <child name="smartcard" schema="org.gnome.settings-daemon.plugins.smartcard"/>
- <child name="sound" schema="org.gnome.settings-daemon.plugins.sound"/>
<child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
<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="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </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="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.clipboard"
path="/org/gnome/settings-daemon/plugins/clipboard/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.mouse"
path="/org/gnome/settings-daemon/plugins/mouse/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.rfkill"
path="/org/gnome/settings-daemon/plugins/rfkill/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </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="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.smartcard"
path="/org/gnome/settings-daemon/plugins/smartcard/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sound"
path="/org/gnome/settings-daemon/plugins/sound/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
</schemalist>
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 3747adf..00e648a 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
@@ -27,10 +27,5 @@
<_summary>Minimum notify period for repeated warnings</_summary>
<_description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often
than this period.</_description>
</key>
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
</schema>
</schemalist>
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 cc58d12..b8fc42c 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
@@ -65,11 +65,6 @@
<_summary>Previous track</_summary>
<_description>Binding to skip to previous track.</_description>
</key>
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
<key name="screensaver" type="s">
<default>'<Super>l'</default>
<_summary>Lock screen</_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 2708138..1f87ec7 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="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
<key name="idle-brightness" type="i">
<default>30</default>
<summary>The brightness of the screen when idle</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 c501c36..4bfd95a 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,12 +1,4 @@
<schemalist>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sharing"
path="/org/gnome/settings-daemon/plugins/sharing/">
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
- </schema>
-
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.sharing.service">
<key name="enabled-connections" type="as">
<default>[]</default>
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 374e083..c4f2cd4 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
@@ -5,11 +5,6 @@
<_summary>File for default configuration for RandR</_summary>
<_description>The XRandR plugin will look for a default configuration in the file specified by this
key. This is similar to the ~/.config/monitors.xml that normally gets stored in users' home directories. If
a user does not have such a file, or has one that does not match the user's setup of monitors, then the file
specified by this key will be used instead.</_description>
</key>
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
<key name="default-monitors-setup" enum="org.gnome.settings-daemon.GsdXrandrBootBehaviour">
<default>'follow-lid'</default>
<_summary>Whether to turn off specific monitors after boot</_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 6f9e0a1..30b695d 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
@@ -10,11 +10,6 @@
<_summary>Hinting</_summary>
<_description>The type of hinting to use when rendering fonts. Possible values are: "none" for no
hinting and "slight" for fitting only to the Y-axis like Microsoft's ClearType, DirectWrite and Adobe's
proprietary font rendering engine. Ignores native hinting within the font, generates hints algorithmically.
Used on Ubuntu by default. Recommended. The meaning of "medium" and "full" depends on the font format (.ttf,
.otf, .pfa/.pfb) and the installed version of FreeType. They usually try to fit glyphs to both the X and the
Y axis (except for .otf: Y-only). This can lead to distortion and/or inconsistent rendering depending on the
quality of the font, the font format and the state of FreeType's font engines.</_description>
</key>
- <key name="priority" type="i">
- <default>0</default>
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue</_description>
- </key>
<key name="rgba-order" enum="org.gnome.settings-daemon.GsdFontRgbaOrder">
<default>'rgb'</default>
<_summary>RGBA order</_summary>
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 4634463..05f568b 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -178,29 +178,6 @@ on_plugin_deactivated (GnomeSettingsPluginInfo *info,
}
static gboolean
-is_schema (const char *schema)
-{
- GSettingsSchemaSource *source = NULL;
- gchar **non_relocatable = NULL;
- gchar **relocatable = NULL;
- gboolean installed = FALSE;
-
- source = g_settings_schema_source_get_default ();
- if (!source)
- return FALSE;
-
- g_settings_schema_source_list_schemas (source, TRUE, &non_relocatable, &relocatable);
-
- if (g_strv_contains ((const gchar * const *)non_relocatable, schema) ||
- g_strv_contains ((const gchar * const *)relocatable, schema))
- installed = TRUE;
-
- g_strfreev (non_relocatable);
- g_strfreev (relocatable);
- return installed;
-}
-
-static gboolean
is_whitelisted (char **whitelist,
const char *plugin_name)
{
@@ -247,19 +224,13 @@ _load_file (GnomeSettingsManager *manager,
gnome_settings_plugin_info_get_location (info));
/* Ignore unknown schemas or else we'll assert */
- if (is_schema (key_name)) {
- manager->priv->plugins = g_slist_prepend (manager->priv->plugins,
- g_object_ref (info));
-
- g_signal_connect (info, "activated",
- G_CALLBACK (on_plugin_activated), manager);
- g_signal_connect (info, "deactivated",
- G_CALLBACK (on_plugin_deactivated), manager);
+ manager->priv->plugins = g_slist_prepend (manager->priv->plugins,
+ g_object_ref (info));
- gnome_settings_plugin_info_set_settings_prefix (info, key_name);
- } else {
- g_warning ("Ignoring unknown module '%s'", key_name);
- }
+ g_signal_connect (info, "activated",
+ G_CALLBACK (on_plugin_activated), manager);
+ g_signal_connect (info, "deactivated",
+ G_CALLBACK (on_plugin_deactivated), manager);
/* Priority is set in the call above */
g_free (key_name);
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.c
b/gnome-settings-daemon/gnome-settings-plugin-info.c
index 51d0379..72fb97a 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.c
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.c
@@ -280,19 +280,6 @@ gnome_settings_plugin_info_new_from_file (const char *filename)
return info;
}
-void
-gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info,
- const char *settings_prefix)
-{
- int priority;
-
- info->priv->settings = g_settings_new (settings_prefix);
-
- priority = g_settings_get_int (info->priv->settings, "priority");
- if (priority > 0)
- info->priv->priority = priority;
-}
-
static void
_deactivate_plugin (GnomeSettingsPluginInfo *info)
{
@@ -486,12 +473,3 @@ gnome_settings_plugin_info_get_priority (GnomeSettingsPluginInfo *info)
return info->priv->priority;
}
-
-void
-gnome_settings_plugin_info_set_priority (GnomeSettingsPluginInfo *info,
- int priority)
-{
- g_return_if_fail (GNOME_IS_SETTINGS_PLUGIN_INFO (info));
-
- info->priv->priority = priority;
-}
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.h
b/gnome-settings-daemon/gnome-settings-plugin-info.h
index 8dd024f..a093373 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.h
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.h
@@ -50,7 +50,6 @@ GType gnome_settings_plugin_info_get_type (void) G_GNUC_CON
GnomeSettingsPluginInfo *gnome_settings_plugin_info_new_from_file (const char *filename);
-void gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info, const char
*settings_prefix);
gboolean gnome_settings_plugin_info_activate (GnomeSettingsPluginInfo *info);
gboolean gnome_settings_plugin_info_deactivate (GnomeSettingsPluginInfo *info);
@@ -65,9 +64,6 @@ const char *gnome_settings_plugin_info_get_copyright (GnomeSettingsPlugin
const char *gnome_settings_plugin_info_get_location (GnomeSettingsPluginInfo *info);
int gnome_settings_plugin_info_get_priority (GnomeSettingsPluginInfo *info);
-void gnome_settings_plugin_info_set_priority (GnomeSettingsPluginInfo *info,
- int priority);
-
G_END_DECLS
#endif /* __GNOME_SETTINGS_PLUGIN_INFO_H__ */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1fbf584..32fbfa3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,14 +4,10 @@ data/gnome-settings-daemon.desktop.in.in
data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.color.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e01d5af..6cdd401 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -10,14 +10,10 @@ data/gnome-settings-daemon.desktop.in
data/org.gnome.settings-daemon.peripherals.gschema.xml.in
data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
data/org.gnome.settings-daemon.plugins.color.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in
data/org.gnome.settings-daemon.plugins.gschema.xml.in
data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in
data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in
data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in
data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
