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

15 files changed, 0 insertions, 179 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 75e796eb..c9d27dcd 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 c78572b8..8b0e09d2 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 946d4aec..aae6f312 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 5631151f..3df07c75 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.datetime.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
deleted file mode 100644
index 43d5cd56..00000000
--- a/data/org.gnome.settings-daemon.plugins.datetime.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.datetime" path="/org/gnome/settings-daemon/plugins/datetime/">
-    <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.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index b87f9af3..fffc11c4 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 3747adff..00e648a2 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.keyboard.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
deleted file mode 100644
index c859e73a..00000000
--- a/data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.keyboard" path="/org/gnome/settings-daemon/plugins/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>
-</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 cc58d124..b8fc42c6 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>'&lt;Super&gt;l'</default>
       <_summary>Lock screen</_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
deleted file mode 100644
index a46fbd0d..00000000
--- a/data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.orientation" path="/org/gnome/settings-daemon/plugins/orientation/">
-    <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.power.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
index 2708138f..1f87ec74 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.print-notifications.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
deleted file mode 100644
index 06f4a746..00000000
--- a/data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.print-notifications" path="/org/gnome/settings-daemon/plugins/print-notifications/">
-    <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.sharing.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
index c501c368..4bfd95ac 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 374e083b..c4f2cd46 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 6f9e0a1b..30b695d1 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>