Merge lp:~khurshid-alam/unity-settings-daemon/usd-schemas-focal into lp:unity-settings-daemon

[Khurshid Alam]

* Port rest of the schemas gnome-settings-daemon-common to com.canonical.unity.settings-daemon. LP: #1842324

* When upstream moved persistant numlock-state to gsettings-desktop-schemas they converted it to boolean from enum. Since now we use our own schema, revert that change. This will make numlock work again in unity. Fixes LP: #1847858

 see https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/commit/d57c3c78336be544e1047127a27f9ddfcea6c8cb

* Remove gnome-settings-daemon-common from build dependency

[Sebastien Bacher (seb128)]

Thanks

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2019-09-02 18:07:57 +0000
+++ data/Makefile.am	2020-03-06 20:26:03 +0000
@@ -3,7 +3,27 @@
 apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon
 api_DATA = gsd-enums.h
 
-gschema_in_files = com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in
+gsettings_ENUM_NAMESPACE = com.canonical.unity.settings-daemon
+gsettings_ENUM_FILES = $(top_srcdir)/data/$(api_DATA)
+
+
+gschema_in_files =							\
+	com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in \
+	com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in
+	
+	
 gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
 
 gsettingsdir = $(datadir)/glib-2.0/schemas
 
=== added file 'data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals" path="/com/canonical/unity/settings-daemon/peripherals/">
+    <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+    <child name="smartcard" schema="com.canonical.unity.settings-daemon.peripherals.smartcard"/>
+    <child name="keyboard" schema="com.canonical.unity.settings-daemon.peripherals.keyboard"/>
+    <child name="mouse" schema="com.canonical.unity.settings-daemon.peripherals.mouse"/>
+    <child name="touchscreen" schema="com.canonical.unity.settings-daemon.peripherals.touchscreen"/>
+    <child name="input-devices" schema="com.canonical.unity.settings-daemon.peripherals.input-devices"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.smartcard" path="/com/canonical/unity/settings-daemon/peripherals/smartcard/">
+    <key name="removal-action" enum="com.canonical.unity.settings-daemon.GsdSmartcardRemovalAction">
+      <default>'none'</default>
+      <summary>Smartcard removal action</summary>
+      <description>Set this to one of “none”, “lock-screen”, or “force-logout”. The action will get performed when the smartcard used for log in is removed.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.keyboard" path="/com/canonical/unity/settings-daemon/peripherals/keyboard/">
+    <key name="click" type="b">
+      <default>true</default>
+    </key>
+    <key name="click-volume" type="i">
+      <default>0</default>
+    </key>
+    <key name="bell-mode" enum="com.canonical.unity.settings-daemon.GsdBellMode">
+      <default>'on'</default>
+      <description>Possible values are “on”, “off”, and “custom”.</description>
+    </key>
+    <key name="bell-pitch" type="i">
+      <default>400</default>
+    </key>
+    <key name="bell-duration" type="i">
+      <default>100</default>
+    </key>
+    <key name="bell-custom-file" type="s">
+      <default>''</default>
+      <summary>Keyboard Bell Custom Filename</summary>
+      <description>File name of the bell sound to be played.</description>
+    </key>
+    <key name="remember-numlock-state" type="b">
+      <default>true</default>
+      <summary>Remember NumLock state</summary>
+      <description>When set to true, GNOME will remember the state of the NumLock LED between sessions.</description>
+    </key>
+    <key name="numlock-state" enum="com.canonical.unity.settings-daemon.GsdNumLockState">
+      <default>'unknown'</default>
+      <summary>NumLock state</summary>
+      <description>The remembered state of the NumLock LED.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.mouse" path="/com/canonical/unity/settings-daemon/peripherals/mouse/">
+    <key name="locate-pointer" type="b">
+      <default>false</default>
+      <summary>Highlights the current location of the pointer when the Control key is pressed and released.</summary>
+    </key>
+    <key name="double-click" type="i">
+      <default>400</default>
+      <summary>Double click time</summary>
+      <description> Length of a double click in milliseconds.</description>
+    </key>
+    <key name="drag-threshold" type="i">
+      <default>8</default>
+      <summary>Drag threshold</summary>
+      <description>Distance before a drag is started.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.touchscreen" path="/com/canonical/unity/settings-daemon/peripherals/touchscreen/">
+    <key name="orientation-lock" type="b">
+      <default>false</default>
+      <summary>Whether the tablet’s orientation is locked, or rotated automatically.</summary>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.input-devices" path="/com/canonical/unity/settings-daemon/peripherals/input-devices/">
+    <key name="hotplug-command" type="s">
+      <default>''</default>
+      <summary>Device hotplug custom command</summary>
+      <description>Command to be run when a device is added or removed. An exit value of 1 means that the device will not be handled further by gnome-settings-daemon.</description>
+    </key>
+  </schema>
+
+  <!-- Deprecated schemas/keys -->
+  <schema id="com.canonical.unity.settings-daemon.peripherals.mouse.deprecated">
+    <key name="left-handed" type="b">
+      <default>false</default>
+      <summary>Mouse button orientation</summary>
+      <description>Swap left and right mouse buttons for left-handed mice.</description>
+    </key>
+    <key name="motion-acceleration" type="d">
+      <default>-1</default>
+      <summary>Single Click</summary>
+      <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
+    </key>
+    <key name="motion-threshold" type="i">
+      <default>-1</default>
+      <summary>Motion Threshold</summary>
+      <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
+    </key>
+    <key name="middle-button-enabled" type="b">
+      <default>false</default>
+      <summary>Middle button emulation</summary>
+      <description>Enables middle mouse button emulation through simultaneous left and right button click.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated">
+    <key name="repeat" type="b">
+      <default>true</default>
+    </key>
+    <key name="repeat-interval" type="u">
+      <default>30</default>
+      <summary>Key Repeat Interval</summary>
+      <description>Delay between repeats in milliseconds.</description>
+    </key>
+    <key name="delay" type="u">
+      <default>500</default>
+      <summary>Initial Key Repeat Delay</summary>
+      <description>Initial key repeat delay in milliseconds.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated">
+    <key name="disable-while-typing" type="b">
+      <default>false</default>
+      <summary>Disable touchpad while typing</summary>
+      <description>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</description>
+    </key>
+    <key name="horiz-scroll-enabled" type="b">
+      <default>true</default>
+      <summary>Enable horizontal scrolling</summary>
+      <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</description>
+    </key>
+    <key name="scroll-method" enum="com.canonical.unity.settings-daemon.GsdTouchpadScrollMethod">
+      <default>'two-finger-scrolling'</default>
+      <summary>Select the touchpad scroll method</summary>
+      <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”, “two-finger-scrolling”.</description>
+    </key>
+    <key name="tap-to-click" type="b">
+      <default>false</default>
+      <summary>Enable mouse clicks with touchpad</summary>
+      <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
+    </key>
+    <key name="touchpad-enabled" type="b">
+      <default>true</default>
+      <summary>Enable touchpad</summary>
+      <description>Set this to TRUE to enable all touchpads.</description>
+    </key>
+    <key name="left-handed" enum="com.canonical.unity.settings-daemon.GsdTouchpadHandedness">
+      <default>'mouse'</default>
+      <summary>Touchpad button orientation</summary>
+      <description>Swap left and right mouse buttons for left-handed mice with “left”, “right” for right-handed, “mouse” to follow the mouse setting.</description>
+    </key>
+    <key name="motion-acceleration" type="d">
+      <default>-1</default>
+      <summary>Single Click</summary>
+      <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
+    </key>
+    <key name="motion-threshold" type="i">
+      <default>-1</default>
+      <summary>Motion Threshold</summary>
+      <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
+    </key>
+    <key name="natural-scroll" type="b">
+      <default>false</default>
+      <summary>Natural scrolling</summary>
+      <description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.trackball.deprecated">
+    <key name="scroll-wheel-emulation-button" type="i">
+      <default>0</default>
+      <range min="0" max="24"/>
+      <summary>Mouse wheel emulation button. 0 to disable the feature.</summary>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.deprecated">
+    <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated"/>
+    <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated"/>
+
+    <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
+    <key name="is-absolute" type="b">
+      <default>true</default>
+      <summary>Wacom stylus absolute mode</summary>
+      <description>Enable this to set the tablet to absolute mode.</description>
+    </key>
+    <key name="area" type="ai">
+      <default>[-1, -1, -1, -1]</default>
+      <summary>Wacom tablet area</summary>
+      <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
+    </key>
+    <key name="keep-aspect" type="b">
+      <default>false</default>
+      <summary>Wacom tablet aspect ratio</summary>
+      <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
+    </key>
+    <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
+      <default>'none'</default>
+      <summary>Wacom tablet rotation</summary>
+      <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
+    </key>
+    <key name="touch" type="b">
+      <default>true</default>
+      <summary>Wacom touch feature</summary>
+      <description>Enable this to move the cursor when the user touches the tablet.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated">
+    <key name="pressurecurve" type="ai">
+      <default>[0, 0, 100, 100]</default>
+      <summary>Wacom stylus pressure curve</summary>
+      <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
+    </key>
+    <key name="buttonmapping" type="ai">
+      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+      <summary>Wacom stylus button mapping</summary>
+      <description>Set this to the logical button mapping.</description>
+    </key>
+    <key name="pressurethreshold" type="i">
+      <default>-1</default>
+      <summary>Wacom stylus pressure threshold</summary>
+      <description>Set this to the pressure value at which a stylus click event is generated.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated">
+    <key name="pressurecurve" type="ai">
+      <default>[0, 0, 100, 100]</default>
+      <summary>Wacom eraser pressure curve</summary>
+      <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
+    </key>
+    <key name="buttonmapping" type="ai">
+      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+      <summary>Wacom eraser button mapping</summary>
+      <description>Set this to the logical button mapping.</description>
+    </key>
+    <key name="pressurethreshold" type="i">
+      <default>-1</default>
+      <summary>Wacom eraser pressure threshold</summary>
+      <description>Set this to the pressure value at which an eraser click event is generated.</description>
+    </key>
+  </schema>
+  <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button.deprecated">
+    <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
+      <default>'none'</default>
+      <summary>Wacom button action type</summary>
+      <description>The type of action triggered by the button being pressed.</description>
+    </key>
+    <key name="custom-action" type="s">
+      <default>''</default>
+      <summary>Key combination for the custom action</summary>
+      <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
+    </key>
+    <key name="custom-elevator-action" type="as">
+      <default>['', '']</default>
+      <summary>Key combinations for a touchring or touchstrip custom action</summary>
+      <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
+    </key>
+    <key name="oled-label" type="s">
+      <default>''</default>
+      <!-- Translators: This is the OLED display on an Intuos4 tablet:
+           http://eu.shop.wacom.eu/images/articles/d9abd9f2d4d88aa0649cda97a8077e2b_8.jpg -->
+      <summary>Button label for OLED display.</summary>
+      <description>Label will be rendered to OLED display belonging to the button</description>
+    </key>
+  </schema>
+  <schema id="org.gnome.desktop.peripherals.tablet.deprecated">
+    <key name="display" type="as">
+      <default>["", "", ""]</default>
+    </key>
+  </schema>
+
+  <!-- The rest of this file is used by unity-settings-daemon only -->
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.gsdwacom" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom">
+    <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus"/>
+    <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser"/>
+
+    <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
+    <key name="is-absolute" type="b">
+      <default>true</default>
+      <summary>Wacom stylus absolute mode</summary>
+      <description>Enable this to set the tablet to absolute mode for unity-settings-daemon.</description>
+    </key>
+    <key name="area" type="ai">
+      <default>[-1, -1, -1, -1]</default>
+      <summary>Wacom tablet area</summary>
+      <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
+    </key>
+    <key name="keep-aspect" type="b">
+      <default>false</default>
+      <summary>Wacom tablet aspect ratio</summary>
+      <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
+    </key>
+    <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
+      <default>'none'</default>
+      <summary>Wacom tablet rotation</summary>
+      <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
+    </key>
+    <key name="touch" type="b">
+      <default>true</default>
+      <summary>Wacom touch feature</summary>
+      <description>Enable this to move the cursor when the user touches the tablet.</description>
+    </key>
+    <key name="tablet-pc-button" type="b">
+      <default>false</default>
+      <summary>Wacom tablet PC feature</summary>
+      <description>Enable this to only report stylus events when the tip is pressed.</description>
+    </key>
+    <key name="display" type="as">
+      <default>["", "", ""]</default>
+      <summary>Wacom display mapping</summary>
+      <description>EDID information of monitor to map tablet to. Must be in the format [vendor, product, serial]. ["","",""] disables mapping.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus">
+    <key name="pressurecurve" type="ai">
+      <default>[0, 0, 100, 100]</default>
+      <summary>Wacom stylus pressure curve</summary>
+      <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
+    </key>
+    <key name="buttonmapping" type="ai">
+      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+      <summary>Wacom stylus button mapping</summary>
+      <description>Set this to the logical button mapping.</description>
+    </key>
+    <key name="pressurethreshold" type="i">
+      <default>-1</default>
+      <summary>Wacom stylus pressure threshold</summary>
+      <description>Set this to the pressure value at which a stylus click event is generated.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser">
+    <key name="pressurecurve" type="ai">
+      <default>[0, 0, 100, 100]</default>
+      <summary>Wacom eraser pressure curve</summary>
+      <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
+    </key>
+    <key name="buttonmapping" type="ai">
+      <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
+      <summary>Wacom eraser button mapping</summary>
+      <description>Set this to the logical button mapping.</description>
+    </key>
+    <key name="pressurethreshold" type="i">
+      <default>-1</default>
+      <summary>Wacom eraser pressure threshold</summary>
+      <description>Set this to the pressure value at which an eraser click event is generated.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button">
+    <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
+      <default>'none'</default>
+      <summary>Wacom button action type</summary>
+      <description>The type of action triggered by the button being pressed.</description>
+    </key>
+    <key name="custom-action" type="s">
+      <default>''</default>
+      <summary>Key combination for the custom action</summary>
+      <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
+    </key>
+    <key name="custom-elevator-action" type="as">
+      <default>['', '']</default>
+      <summary>Key combinations for a touchring or touchstrip custom action</summary>
+      <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.color" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+    <key name="recalibrate-display-threshold" type="u">
+      <default>0</default>
+      <summary>The duration a display profile is valid</summary>
+      <description>This is the number of days after which the display color profile is considered invalid.</description>
+    </key>
+    <key name="recalibrate-printer-threshold" type="u">
+      <default>0</default>
+      <summary>The duration a printer profile is valid</summary>
+      <description>This is the number of days after which the printer color profile is considered invalid.</description>
+    </key>
+    <key name="night-light-enabled" type="b">
+      <default>false</default>
+      <summary>If the night light mode is enabled</summary>
+      <description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
+    </key>
+    <key name="night-light-temperature" type="u">
+      <default>4000</default>
+      <summary>Temperature of the display when enabled</summary>
+      <description>This temperature in Kelvin is used to modify the screen tones when night light mode is enabled. Higher values are bluer, lower redder.</description>
+    </key>
+    <key name="night-light-schedule-automatic" type="b">
+      <default>true</default>
+      <summary>Use the sunrise and sunset</summary>
+      <description>Calculate the sunrise and sunset times automatically, from the current location.</description>
+    </key>
+    <key name="night-light-schedule-from" type="d">
+      <default>20.00</default>
+      <summary>The start time</summary>
+      <description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
+    </key>
+    <key name="night-light-schedule-to" type="d">
+      <default>6.00</default>
+      <summary>The end time</summary>
+      <description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
+    </key>
+    <key name="night-light-last-coordinates" type="(dd)">
+      <default>(91,181)</default>
+      <summary>The last detected position</summary>
+      <description>When location services are available this represents the last detected location. The default value is an invalid value to ensure it is always updated at startup.</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.datetime" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins" path="/com/canonical/unity/settings-daemon/plugins/">
+    <key name="whitelisted-plugins" type="as">
+      <default>['all']</default>
+      <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”).
+        This is only evaluated on startup.
+      </description>
+    </key>
+    <child name="a11y-keyboard" schema="com.canonical.unity.settings-daemon.plugins.a11y-keyboard"/>
+    <child name="a11y-settings" schema="com.canonical.unity.settings-daemon.plugins.a11y-settings"/>
+    <child name="background" schema="com.canonical.unity.settings-daemon.plugins.background"/>
+    <child name="clipboard" schema="com.canonical.unity.settings-daemon.plugins.clipboard"/>
+    <child name="color" schema="com.canonical.unity.settings-daemon.plugins.color"/>
+    <child name="cursor" schema="com.canonical.unity.settings-daemon.plugins.cursor"/>
+    <child name="datetime" schema="com.canonical.unity.settings-daemon.plugins.datetime"/>
+    <child name="gsdwacom" schema="com.canonical.unity.settings-daemon.plugins.gsdwacom"/>
+    <child name="housekeeping" schema="com.canonical.unity.settings-daemon.plugins.housekeeping"/>
+    <child name="keyboard" schema="com.canonical.unity.settings-daemon.plugins.keyboard"/>
+    <child name="media-keys" schema="com.canonical.unity.settings-daemon.plugins.media-keys"/>
+    <child name="mouse" schema="com.canonical.unity.settings-daemon.plugins.mouse"/>
+    <child name="orientation" schema="com.canonical.unity.settings-daemon.plugins.orientation"/>
+    <child name="power" schema="com.canonical.unity.settings-daemon.plugins.power"/>
+    <child name="print-notifications" schema="com.canonical.unity.settings-daemon.plugins.print-notifications"/>
+    <child name="remote-display" schema="com.canonical.unity.settings-daemon.plugins.remote-display"/>
+    <child name="screensaver-proxy" schema="com.canonical.unity.settings-daemon.plugins.screensaver-proxy"/>
+    <child name="sharing" schema="com.canonical.unity.settings-daemon.plugins.sharing"/>
+    <child name="smartcard" schema="com.canonical.unity.settings-daemon.plugins.smartcard"/>
+    <child name="sound" schema="com.canonical.unity.settings-daemon.plugins.sound"/>
+    <child name="xrandr" schema="com.canonical.unity.settings-daemon.plugins.xrandr"/>
+    <child name="xsettings" schema="com.canonical.unity.settings-daemon.plugins.xsettings"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-keyboard" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-settings" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.background" path="/com/canonical/unity/settings-daemon/plugins/background/">
+   <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+   </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.clipboard" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.cursor" path="/com/canonical/unity/settings-daemon/plugins/cursor/">
+   <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.mouse" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.remote-display" path="/com/canonical/unity/settings-daemon/plugins/remote-display/">
+   <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+       <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+     </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.rfkill" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.screensaver-proxy" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.smartcard" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sound" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.housekeeping" path="/com/canonical/unity/settings-daemon/plugins/housekeeping/">
+   <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+    <key name="ignore-paths" type="as">
+      <default>[]</default>
+      <summary>Mount paths to ignore</summary>
+      <description>Specify a list of mount paths to ignore when they run low on space.</description>
+    </key>
+    <key name="free-percent-notify" type="d">
+      <default>0.05</default>
+      <range min="0.0" max="1.0"/>
+      <summary>Free percentage notify threshold</summary>
+      <description>Percentage free space threshold for initial warning of low disk space. If the percentage free space drops below this, a warning will be shown.</description>
+    </key>
+    <key name="free-percent-notify-again" type="d">
+      <default>0.01</default>
+      <range min="0.0" max="1.0"/>
+      <summary>Subsequent free space percentage notify threshold</summary>
+      <description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</description>
+    </key>
+    <key name="free-size-gb-no-notify" type="i">
+      <default>1</default>
+      <summary>Free space notify threshold</summary>
+      <description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</description>
+    </key>
+    <key name="min-notify-period" type="i">
+      <default>10</default>
+      <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>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.keyboard" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.orientation" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.power" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+    <key name="idle-brightness" type="i">
+      <default>30</default>
+      <summary>The brightness of the screen when idle</summary>
+      <description>This is the laptop panel screen brightness used when the session is idle.</description>
+    </key>
+    <key name="idle-dim" type="b">
+      <default>true</default>
+      <summary>Dim the screen after a period of inactivity</summary>
+      <description>If the screen should be dimmed to save power when the computer is idle.</description>
+    </key>
+    <key name="sleep-inactive-ac-timeout" type="i">
+      <default>1200</default>
+      <summary>Sleep timeout computer when on AC</summary>
+      <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
+    </key>
+    <key name="sleep-inactive-ac-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+      <description>The type of sleeping that should be performed when the computer is inactive.</description>
+    </key>
+    <key name="sleep-inactive-battery-timeout" type="i">
+      <default>1200</default>
+      <summary>Sleep timeout computer when on battery</summary>
+      <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
+    </key>
+    <key name="sleep-inactive-battery-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+      <description>The type of sleeping that should be performed when the computer is inactive.</description>
+    </key>
+    <!-- See http://bugzilla.gnome.org/637473 for rationale -->
+    <key name="lid-close-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Laptop lid close action on battery</summary>
+      <description>The action to take when the laptop lid is closed and the laptop is on battery power.</description>
+    </key>
+    <key name="lid-close-ac-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Laptop lid close action when on AC</summary>
+      <description>The action to take when the laptop lid is closed and the laptop is on AC power.</description>
+    </key>
+    <key name="lid-close-suspend-with-external-monitor" type="b">
+      <default>false</default>
+      <summary>Laptop lid, when closed, will suspend even if there is an external monitor plugged in</summary>
+      <description>With no external monitors plugged in, closing a laptop's lid
+	will suspend the machine (as set by the lid-close-battery-action and
+	lid-close-ac-action keys).  By default, however, closing the lid when
+	an external monitor is present will not suspend the machine, so that one can keep
+	working on that monitor (e.g. for docking stations or media viewers).  Set this
+	key to False to keep the default behavior, or to True to suspend the laptop whenever the
+	lid is closed and regardless of external monitors.</description>
+    </key>
+    <key name="ambient-enabled" type="b">
+      <default>true</default>
+      <summary>Enable the ALS sensor</summary>
+      <description>If the ambient light sensor functionality is enabled.</description>
+    </key>
+    <key name="power-button-action" enum="com.canonical.unity.settings-daemon.GsdPowerButtonActionType">
+      <default>'suspend'</default>
+      <summary>Power button action</summary>
+      <description>The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend).</description>
+    </key>
+    <!-- Obsolete keys still used by unity-settings-daemon -->
+    <key name="button-suspend" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Suspend button action</summary>
+      <description>The action to take when the system suspend button is pressed.</description>
+    </key>
+    <key name="button-hibernate" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'hibernate'</default>
+      <summary>Hibernate button action</summary>
+      <description>The action to take when the system hibernate button is pressed.</description>
+    </key>
+    <key name="button-sleep" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'hibernate'</default>
+      <summary>Sleep button action</summary>
+      <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
+    </key>
+    <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
+    <key name="button-power" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'suspend'</default>
+      <summary>Power button action</summary>
+      <description>The action to take when the system power button is pressed.</description>
+    </key>
+    <key name="critical-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
+      <default>'hibernate'</default>
+      <summary>Battery critical low action</summary>
+      <description>The action to take when the battery is critically low.</description>
+    </key>
+    <key name="percentage-low" type="i">
+      <default>10</default>
+      <summary>Percentage considered low</summary>
+      <description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="percentage-critical" type="i">
+      <default>3</default>
+      <summary>Percentage considered critical</summary>
+      <description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="percentage-action" type="i">
+      <default>2</default>
+      <summary>Percentage action is taken</summary>
+      <description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="time-low" type="i">
+      <default>1200</default>
+      <summary>The time remaining when low</summary>
+      <description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="time-critical" type="i">
+      <default>300</default>
+      <summary>The time remaining when critical</summary>
+      <description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="time-action" type="i">
+      <default>120</default>
+      <summary>The time remaining when action is taken</summary>
+      <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="use-time-for-policy" type="b">
+      <default>true</default>
+      <summary>Whether to use time-based notifications</summary>
+      <description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</description>
+    </key>
+    <key name="notify-perhaps-recall" type="b">
+      <default>true</default>
+      <summary>If we should show the recalled battery warning for a broken battery</summary>
+      <description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.print-notifications" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing" path="/com/canonical/unity/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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing.service">
+    <key name="enabled-connections" type="as">
+      <default>[]</default>
+      <summary>On which connections the service is enabled</summary>
+      <description>The list of NetworkManager connections (each one represented with its UUID) on which this service is enabled and started.</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xrandr" path="/com/canonical/unity/settings-daemon/plugins/xrandr/">
+    <key name="default-configuration-file" type="s">
+      <default>'/etc/gnome-settings-daemon/xrandr/monitors.xml'</default>
+      <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="default-monitors-setup" enum="com.canonical.unity.settings-daemon.GsdXrandrBootBehaviour">
+      <default>'follow-lid'</default>
+      <summary>Whether to turn off specific monitors after boot</summary>
+      <description>“clone” will display the same thing on all monitors, “dock” will switch off the internal monitor, “do-nothing” will use the default Xorg behaviour (extend the desktop in recent versions). The default, “follow-lid”, will choose between “do-nothing” and “dock” depending on whether the lid is (respectively) open or closed.</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 unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in	2020-03-06 20:26:03 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xsettings" path="/com/canonical/unity/settings-daemon/plugins/xsettings/">
+   <key name="priority" type="i">
+      <default>0</default>
+      <summary>Priority to use for this plugin</summary>
+      <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+    </key>
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Activation of this plugin</summary>
+      <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+    </key>
+    <key name="antialiasing" enum="com.canonical.unity.settings-daemon.GsdFontAntialiasingMode">
+      <default>'grayscale'</default>
+      <summary>Antialiasing</summary>
+      <description>The type of antialiasing to use when rendering fonts. Possible values are: “none” for no antialiasing, “grayscale” for standard grayscale antialiasing, and “rgba” for subpixel antialiasing (LCD screens only).</description>
+    </key>
+    <key name="hinting" enum="com.canonical.unity.settings-daemon.GsdFontHinting">
+      <default>'slight'</default>
+      <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="rgba-order" enum="com.canonical.unity.settings-daemon.GsdFontRgbaOrder">
+      <default>'rgb'</default>
+      <summary>RGBA order</summary>
+      <description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to “rgba”. Possible values are: “rgb” for red on left (most common), “bgr” for blue on left, “vrgb” for red on top, “vbgr” for red on bottom.</description>
+    </key>
+    <key name="disabled-gtk-modules" type="as">
+      <default>[]</default>
+      <summary>List of explicitly disabled GTK+ modules</summary>
+      <description>A list of strings representing the GTK+ modules that will not be loaded, even if enabled by default in their configuration.</description>
+    </key>
+    <key name="enabled-gtk-modules" type="as">
+      <default>[]</default>
+      <summary>List of explicitly enabled GTK+ modules</summary>
+      <description>A list of strings representing the GTK+ modules that will be loaded, usually in addition to conditional and forcibly disabled ones.</description>
+    </key>
+    <key type="a{sv}" name="overrides">
+      <default>{}</default>
+      <summary>A dictionary of XSETTINGS to override</summary>
+      <description>This dictionary maps XSETTINGS names to overrides values. The values must be either strings, signed int32s or (in the case of colors), 4-tuples of uint16 (red, green, blue, alpha; 65535 is fully opaque).</description>
+    </key>
+  </schema>
+</schemalist>
 
=== modified file 'data/gnome-settings-daemon.convert'
--- data/gnome-settings-daemon.convert	2013-11-13 01:49:28 +0000
+++ data/gnome-settings-daemon.convert	2020-03-06 20:26:03 +0000
@@ -1,7 +1,7 @@
-[org.gnome.settings-daemon.peripherals.smartcard]
+[com.canonical.unity.settings-daemon.peripherals.smartcard]
 removal-action = /desktop/gnome/peripherals/smartcard/removal_action
 
-[org.gnome.settings-daemon.peripherals.touchpad]
+[com.canonical.unity.settings-daemon.peripherals.touchpad]
 disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing
 horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled
 scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method
@@ -10,23 +10,23 @@
 motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
 
-[org.gnome.settings-daemon.plugins.a11y-keyboard]
+[com.canonical.unity.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.background]
+[com.canonical.unity.settings-daemon.plugins.background]
 active = /apps/gnome_settings_daemon/plugins/background/active
 priority = /apps/gnome_settings_daemon/plugins/background/priority
 
-[org.gnome.settings-daemon.plugins.clipboard]
+[com.canonical.unity.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]
+[com.canonical.unity.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]
+[com.canonical.unity.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
@@ -35,11 +35,11 @@
 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]
+[com.canonical.unity.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]
+[com.canonical.unity.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
@@ -65,11 +65,11 @@
 window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
 terminal = /apps/metacity/global_keybindings/run_command_terminal
 
-[org.gnome.settings-daemon.plugins.mouse]
+[com.canonical.unity.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]
+[com.canonical.unity.settings-daemon.peripherals.mouse]
 locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
 double-click = /desktop/gnome/peripherals/mouse/double_click
 drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
@@ -77,20 +77,20 @@
 motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
 
-[org.gnome.settings-daemon.plugins.smartcard]
+[com.canonical.unity.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]
+[com.canonical.unity.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]
+[com.canonical.unity.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]
+[com.canonical.unity.settings-daemon.plugins.xsettings]
 active = /apps/gnome_settings_daemon/plugins/xsettings/active
 antialiasing = /desktop/gnome/font_rendering/antialiasing
 hinting = /desktop/gnome/font_rendering/hinting
 
=== modified file 'data/gsd-enums.h'
--- data/gsd-enums.h	2013-01-25 15:43:27 +0000
+++ data/gsd-enums.h	2020-03-06 20:26:03 +0000
@@ -112,6 +112,14 @@
 
 typedef enum
 {
+  GSD_POWER_BUTTON_ACTION_NOTHING,
+  GSD_POWER_BUTTON_ACTION_SUSPEND,
+  GSD_POWER_BUTTON_ACTION_HIBERNATE,
+  GSD_POWER_BUTTON_ACTION_INTERACTIVE
+} GsdPowerButtonActionType;
+
+typedef enum
+{
   GSD_UPDATE_TYPE_ALL,
   GSD_UPDATE_TYPE_SECURITY,
   GSD_UPDATE_TYPE_NONE
 
=== modified file 'debian/control'
--- debian/control	2020-02-23 15:03:25 +0000
+++ debian/control	2020-03-06 20:26:03 +0000
@@ -60,7 +60,6 @@
          gsettings-desktop-schemas (>= 3.15.4),
          nautilus-data (>= 2.91.3-1),
          unity-settings-daemon-schemas (>= ${source:Version}),
-         gnome-settings-daemon-common (>= 3.16),
          gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
 Recommends: ibus (>= 1.5.0),
             pulseaudio,
 
=== modified file 'gnome-settings-daemon/gnome-settings-manager.c'
--- gnome-settings-daemon/gnome-settings-manager.c	2016-06-02 07:50:58 +0000
+++ gnome-settings-daemon/gnome-settings-manager.c	2020-03-06 20:26:03 +0000
@@ -36,7 +36,7 @@
 #include "gnome-settings-profile.h"
 #include "gsd-pnp-ids.h"
 
-#define DEFAULT_SETTINGS_PREFIX "org.gnome.settings-daemon"
+#define DEFAULT_SETTINGS_PREFIX "com.canonical.unity.settings-daemon"
 
 #define PLUGIN_EXT ".gnome-settings-plugin"
 
 
=== modified file 'gnome-settings-daemon/main.c'
--- gnome-settings-daemon/main.c	2016-05-20 16:50:05 +0000
+++ gnome-settings-daemon/main.c	2020-03-06 20:26:03 +0000
@@ -264,7 +264,7 @@
         GSettings *settings;
         gboolean enabled;
 
-        settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard");
+        settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.keyboard");
         enabled = g_settings_get_boolean (settings, "active");
         g_object_unref (settings);
 
 
=== modified file 'plugins/color/gsd-color-manager.c'
--- plugins/color/gsd-color-manager.c	2016-05-20 21:20:36 +0000
+++ plugins/color/gsd-color-manager.c	2020-03-06 20:26:03 +0000
@@ -2164,7 +2164,7 @@
         /* use DMI data for internal panels */
         priv->dmi = gcm_dmi_new ();
 
-        priv->settings = g_settings_new ("org.gnome.settings-daemon.plugins.color");
+        priv->settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.color");
         priv->client = cd_client_new ();
         g_signal_connect (priv->client, "device-added",
                           G_CALLBACK (gcm_session_device_added_notify_cb),
 
=== modified file 'plugins/common/gsd-input-helper.c'
--- plugins/common/gsd-input-helper.c	2016-05-24 15:03:22 +0000
+++ plugins/common/gsd-input-helper.c	2020-03-06 20:26:03 +0000
@@ -31,7 +31,7 @@
 
 #include "gsd-input-helper.h"
 
-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.peripherals.input-devices"
 #define KEY_HOTPLUG_COMMAND  "hotplug-command"
 
 #define ABS_MT_X "Abs MT Position X"
 
=== modified file 'plugins/common/input-device-example.sh'
--- plugins/common/input-device-example.sh	2012-10-09 09:08:27 +0000
+++ plugins/common/input-device-example.sh	2020-03-06 20:26:03 +0000
@@ -16,7 +16,7 @@
 # ignored from future configuration.
 #
 # Set the script to be used with:
-# gsettings set org.gnome.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh
+# gsettings set com.canonical.unity.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh
 #
 
 args=`getopt "t:i:" $*`
 
=== modified file 'plugins/common/test-plugin.h'
--- plugins/common/test-plugin.h	2012-12-17 11:21:23 +0000
+++ plugins/common/test-plugin.h	2020-03-06 20:26:03 +0000
@@ -35,7 +35,7 @@
 
 	list = g_settings_list_schemas ();
 	for (i = 0; list[i] != NULL; i++) {
-		if (g_str_equal (list[i], "org.gnome.settings-daemon.plugins." SCHEMA_NAME))
+		if (g_str_equal (list[i], "com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME))
 			return TRUE;
 	}
 	return FALSE;
@@ -45,9 +45,9 @@
 print_enable_disable_help (void)
 {
 	fprintf (stderr, "To deactivate:\n");
-	fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active false\n");
+	fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active false\n");
 	fprintf (stderr, "To reactivate:\n");
-	fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active true\n");
+	fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active true\n");
 }
 
 int
@@ -73,7 +73,7 @@
 	if (has_settings () == FALSE) {
 		fprintf (stderr, "The schemas for plugin '%s' isn't available, check your installation.\n", SCHEMA_NAME);
 	} else {
-		settings = g_settings_new ("org.gnome.settings-daemon.plugins." SCHEMA_NAME);
+		settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME);
 		if (g_settings_get_boolean (settings, "active") != FALSE) {
 			fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);
 			print_enable_disable_help ();
 
=== modified file 'plugins/housekeeping/gsd-disk-space.c'
--- plugins/housekeeping/gsd-disk-space.c	2015-10-07 17:07:26 +0000
+++ plugins/housekeeping/gsd-disk-space.c	2020-03-06 20:26:03 +0000
@@ -45,7 +45,7 @@
 
 #define DISK_SPACE_ANALYZER        "baobab"
 
-#define SETTINGS_HOUSEKEEPING_DIR     "org.gnome.settings-daemon.plugins.housekeeping"
+#define SETTINGS_HOUSEKEEPING_DIR     "com.canonical.unity.settings-daemon.plugins.housekeeping"
 #define SETTINGS_FREE_PC_NOTIFY_KEY   "free-percent-notify"
 #define SETTINGS_FREE_PC_NOTIFY_AGAIN_KEY "free-percent-notify-again"
 #define SETTINGS_FREE_SIZE_NO_NOTIFY  "free-size-gb-no-notify"
 
=== modified file 'plugins/housekeeping/gsd-ldsm-dialog.c'
--- plugins/housekeeping/gsd-ldsm-dialog.c	2015-02-05 11:01:43 +0000
+++ plugins/housekeeping/gsd-ldsm-dialog.c	2020-03-06 20:26:03 +0000
@@ -24,7 +24,7 @@
 
 #include "gsd-ldsm-dialog.h"
 
-#define SETTINGS_HOUSEKEEPING_DIR     "org.gnome.settings-daemon.plugins.housekeeping"
+#define SETTINGS_HOUSEKEEPING_DIR     "com.canonical.unity.settings-daemon.plugins.housekeeping"
 
 enum
 {
 
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2019-09-01 15:22:44 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2020-03-06 20:26:03 +0000
@@ -69,7 +69,7 @@
 
 #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
 
-#define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"
+#define GSD_KEYBOARD_DIR "com.canonical.unity.settings-daemon.peripherals.keyboard"
 #define GSETTINGS_KEYBOARD_SCHEMA     "org.gnome.desktop.peripherals.keyboard"
 
 #define KEY_REPEAT         "repeat"
@@ -685,7 +685,7 @@
 			g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
 				 num_lock_state_to_string (numlock_state),
 				 num_lock_state_to_string (manager->priv->old_state));
-			g_settings_set_enum (manager->priv->gsettings,
+			g_settings_set_enum (manager->priv->settings,
 					     KEY_NUMLOCK_STATE,
 					     numlock_state);
 			manager->priv->old_state = numlock_state;
@@ -1793,9 +1793,9 @@
         gboolean rnumlock;
 
         g_debug ("Applying the num-lock settings");
-        settings = manager->priv->gsettings;
+        settings = manager->priv->settings;
         rnumlock = g_settings_get_boolean  (settings, KEY_REMEMBER_NUMLOCK_STATE);
-        manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE);
+        manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
 
         gdk_error_trap_push ();
         if (rnumlock) {
@@ -2629,12 +2629,11 @@
         GsdSettingsMigrateEntry entries[] = {
                 { "repeat",          "repeat",          NULL },
                 { "repeat-interval", "repeat-interval", NULL },
-                { "delay",           "delay",           NULL },
-                { "remember-numlock-state", "remember-numlock-state", NULL },
+                { "delay",           "delay",           NULL }
         };
 
-        gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",
-                                    "/org/gnome/settings-daemon/peripherals/keyboard/",
+        gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated",
+                                    "/com/canonical/unity/settings-daemon/peripherals/keyboard/",
                                     "org.gnome.desktop.peripherals.keyboard",
                                     "/org/gnome/desktop/peripherals/keyboard/",
                                     entries, G_N_ELEMENTS (entries));
 
=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2018-11-30 10:40:30 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2020-03-06 20:26:03 +0000
@@ -110,8 +110,8 @@
 "</node>";
 
 #define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface"
-#define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
-#define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
+#define SETTINGS_POWER_DIR "com.canonical.unity.settings-daemon.plugins.power"
+#define SETTINGS_XSETTINGS_DIR "com.canonical.unity.settings-daemon.plugins.xsettings"
 #define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
 #define UNITY_SETTINGS_INTERFACE_DIR "com.canonical.Unity.Interface"
 
 
=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c	2019-09-01 15:22:44 +0000
+++ plugins/mouse/gsd-mouse-manager.c	2020-03-06 20:26:03 +0000
@@ -1401,18 +1401,18 @@
                 { "natural-scroll",       "natural-scroll", NULL }
         };
 
-        gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.trackball.deprecated",
-                                    "/org/gnome/settings-daemon/peripherals/trackball/",
+        gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.trackball.deprecated",
+                                    "/com/canonical/unity/settings-daemon/peripherals/trackball/",
                                     "org.gnome.desktop.peripherals.trackball",
                                     "/org/gnome/desktop/peripherals/trackball/",
                                     trackball_entries, G_N_ELEMENTS (trackball_entries));
-        gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.mouse.deprecated",
-                                    "/org/gnome/settings-daemon/peripherals/mouse/",
+        gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.mouse.deprecated",
+                                    "/com/canonical/unity/settings-daemon/peripherals/mouse/",
                                     "org.gnome.desktop.peripherals.mouse",
                                     "/org/gnome/desktop/peripherals/mouse/",
                                     mouse_entries, G_N_ELEMENTS (mouse_entries));
-        gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.touchpad.deprecated",
-                                    "/org/gnome/settings-daemon/peripherals/touchpad/",
+        gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated",
+                                    "/com/canonical/unity/settings-daemon/peripherals/touchpad/",
                                     "org.gnome.desktop.peripherals.touchpad",
                                     "/org/gnome/desktop/peripherals/touchpad/",
                                     touchpad_entries, G_N_ELEMENTS (touchpad_entries));
 
=== modified file 'plugins/orientation/gsd-orientation-manager.c'
--- plugins/orientation/gsd-orientation-manager.c	2015-10-07 16:12:45 +0000
+++ plugins/orientation/gsd-orientation-manager.c	2020-03-06 20:26:03 +0000
@@ -67,7 +67,7 @@
         gboolean orientation_lock;
 };
 
-#define CONF_SCHEMA "org.gnome.settings-daemon.peripherals.touchscreen"
+#define CONF_SCHEMA "com.canonical.unity.settings-daemon.peripherals.touchscreen"
 #define ORIENTATION_LOCK_KEY "orientation-lock"
 
 #define GSD_ORIENTATION_DBUS_NAME GSD_DBUS_NAME ".Orientation"
 
=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2019-06-23 08:50:48 +0000
+++ plugins/power/gsd-power-manager.c	2020-03-06 20:26:03 +0000
@@ -59,8 +59,8 @@
 #define UPOWER_DBUS_INTERFACE                   "org.freedesktop.UPower"
 #define UPOWER_DBUS_INTERFACE_KBDBACKLIGHT      "org.freedesktop.UPower.KbdBacklight"
 
-#define GSD_POWER_SETTINGS_SCHEMA               "org.gnome.settings-daemon.plugins.power"
-#define GSD_XRANDR_SETTINGS_SCHEMA              "org.gnome.settings-daemon.plugins.xrandr"
+#define GSD_POWER_SETTINGS_SCHEMA               "com.canonical.unity.settings-daemon.plugins.power"
+#define GSD_XRANDR_SETTINGS_SCHEMA              "com.canonical.unity.settings-daemon.plugins.xrandr"
 
 #define GSD_POWER_DBUS_NAME                     GSD_DBUS_NAME ".Power"
 #define GSD_POWER_DBUS_PATH                     GSD_DBUS_PATH "/Power"
 
=== modified file 'plugins/power/test.py'
--- plugins/power/test.py	2013-12-04 23:55:26 +0000
+++ plugins/power/test.py	2020-03-06 20:26:03 +0000
@@ -76,7 +76,7 @@
         self.settings_screensaver = Gio.Settings('org.gnome.desktop.screensaver')
         self.settings_screensaver['lock-enabled'] = False
 
-        self.settings_gsd_power = Gio.Settings('org.gnome.settings-daemon.plugins.power')
+        self.settings_gsd_power = Gio.Settings('com.canonical.unity.settings-daemon.plugins.power')
 
         # start power plugin
         self.settings_gsd_power['active'] = False
 
=== modified file 'plugins/sharing/gsd-sharing-manager.c'
--- plugins/sharing/gsd-sharing-manager.c	2018-02-21 21:19:43 +0000
+++ plugins/sharing/gsd-sharing-manager.c	2020-03-06 20:26:03 +0000
@@ -780,8 +780,8 @@
 
                 service = g_new0 (ServiceInfo, 1);
                 service->name = services[i];
-                path = g_strdup_printf ("/org/gnome/settings-daemon/plugins/sharing/%s/", services[i]);
-                service->settings = g_settings_new_with_path ("org.gnome.settings-daemon.plugins.sharing.service", path);
+                path = g_strdup_printf ("/com/canonical/unity/settings-daemon/plugins/sharing/%s/", services[i]);
+                service->settings = g_settings_new_with_path ("com.canonical.unity.settings-daemon.plugins.sharing.service", path);
                 g_free (path);
 
                 g_hash_table_insert (manager->priv->services, (gpointer) services[i], service);
 
=== modified file 'plugins/smartcard/gsd-smartcard-plugin.c'
--- plugins/smartcard/gsd-smartcard-plugin.c	2016-05-20 21:21:08 +0000
+++ plugins/smartcard/gsd-smartcard-plugin.c	2020-03-06 20:26:03 +0000
@@ -163,7 +163,7 @@
         char *remove_action_string;
         GsdSmartcardRemoveAction remove_action;
 
-        settings = g_settings_new ("org.gnome.settings-daemon.peripherals.smartcard");
+        settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.smartcard");
         remove_action_string = g_settings_get_string (settings, KEY_REMOVE_ACTION);
 
         if (remove_action_string == NULL) {
 
=== modified file 'plugins/updates/gsd-updates-common.h'
--- plugins/updates/gsd-updates-common.h	2017-03-28 08:17:41 +0000
+++ plugins/updates/gsd-updates-common.h	2020-03-06 20:26:03 +0000
@@ -35,7 +35,7 @@
 #define GSD_SETTINGS_LAST_UPDATES_NOTIFICATION          "last-updates-notification"
 #define GSD_SETTINGS_MEDIA_REPO_FILENAMES               "media-repo-filenames"
 #define GSD_SETTINGS_NOTIFY_DISTRO_UPGRADES             "notify-distro-upgrades"
-#define GSD_SETTINGS_SCHEMA                             "org.gnome.settings-daemon.plugins.updates"
+#define GSD_SETTINGS_SCHEMA                             "com.canonical.unity.settings-daemon.plugins.updates"
 #define GSD_SETTINGS_UPDATE_BATTERY                     "update-battery"
 #define GSD_SETTINGS_AUTO_DOWNLOAD_UPDATES              "auto-download-updates"
 
 
=== modified file 'plugins/updates/gsd-updates-manager.c'
--- plugins/updates/gsd-updates-manager.c	2018-02-14 12:40:59 +0000
+++ plugins/updates/gsd-updates-manager.c	2020-03-06 20:26:03 +0000
@@ -1322,7 +1322,7 @@
                           G_CALLBACK (settings_changed_cb), manager);
 
         /* get ftp settings */
-        manager->priv->settings_gsd = g_settings_new ("org.gnome.settings-daemon.plugins.updates");
+        manager->priv->settings_gsd = g_settings_new ("com.canonical.unity.settings-daemon.plugins.updates");
         g_signal_connect (manager->priv->settings_gsd, "changed",
                           G_CALLBACK (settings_gsd_changed_cb), manager);
 
 
=== modified file 'plugins/wacom/README.config-storage'
--- plugins/wacom/README.config-storage	2012-04-25 12:40:32 +0000
+++ plugins/wacom/README.config-storage	2020-03-06 20:26:03 +0000
@@ -12,8 +12,8 @@
 configurations, whether on a single machine, or using a shared home directory.
 
 The configuration scheme is:
-schema: org.gnome.settings-daemon.peripherals.wacom
-path: /org/gnome/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/
+schema: com.canonical.unity.settings-daemon.peripherals.wacom
+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/
 
 where <machine ID> is the D-Bus machine-id for the machine, and
 <device ID> is a unique identifier for the tablet.
@@ -25,10 +25,10 @@
 is the tool ID, for professional ranges, and a generic identifier for
 the consumer ranges that do not support tool ID.
 
-schema: org.gnome.settings-daemon.peripherals.wacom.stylus
-or:     org.gnome.settings-daemon.peripherals.wacom.eraser
+schema: com.canonical.unity.settings-daemon.peripherals.wacom.stylus
+or:     com.canonical.unity.settings-daemon.peripherals.wacom.eraser
 
-path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/
+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/
 
 So each tool can be configured per tablet (so the compatible airbrush stylus
 will have different configurations on a Cintiq and an Intuos tablet)
@@ -36,8 +36,8 @@
 Buttons
 -------
 
-schema: org.gnome.settings-daemon.peripherals.wacom.tablet-button
-path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<button ID>
+schema: com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button
+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<button ID>
 
 Testing
 -------
 
=== modified file 'plugins/wacom/gsd-wacom-device.c'
--- plugins/wacom/gsd-wacom-device.c	2015-10-07 16:32:40 +0000
+++ plugins/wacom/gsd-wacom-device.c	2020-03-06 20:26:03 +0000
@@ -40,11 +40,11 @@
 
 #define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
 
-#define WACOM_TABLET_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
-#define WACOM_DEVICE_CONFIG_BASE "/org/gnome/settings-daemon/peripherals/wacom/%s-%s/"
-#define WACOM_STYLUS_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.stylus"
-#define WACOM_ERASER_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.eraser"
-#define WACOM_BUTTON_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.tablet-button"
+#define WACOM_TABLET_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom"
+#define WACOM_DEVICE_CONFIG_BASE "/com/canonical/unity/settings-daemon/peripherals/wacom/%s-%s/"
+#define WACOM_STYLUS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.stylus"
+#define WACOM_ERASER_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.eraser"
+#define WACOM_BUTTON_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button"
 
 static struct {
 	GsdRRRotation  rotation;
@@ -316,7 +316,7 @@
  * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
  * Tool-specific settings: applied to one tool only.
  */
-#define SETTINGS_WACOM_DIR         "org.gnome.settings-daemon.peripherals.wacom"
+#define SETTINGS_WACOM_DIR         "com.canonical.unity.settings-daemon.peripherals.wacom"
 #define SETTINGS_STYLUS_DIR        "stylus"
 #define SETTINGS_ERASER_DIR        "eraser"
 
 
=== modified file 'plugins/wacom/gsd-wacom-osd-window.c'
--- plugins/wacom/gsd-wacom-osd-window.c	2013-10-04 07:53:20 +0000
+++ plugins/wacom/gsd-wacom-osd-window.c	2020-03-06 20:26:03 +0000
@@ -36,7 +36,7 @@
 #define ACTION_TYPE_KEY             "action-type"
 #define CUSTOM_ACTION_KEY           "custom-action"
 #define CUSTOM_ELEVATOR_ACTION_KEY  "custom-elevator-action"
-#define RES_PATH                    "/org/gnome/settings-daemon/plugins/wacom/"
+#define RES_PATH                    "/com/canonical/unity/settings-daemon/plugins/wacom/"
 
 #define BACK_OPACITY		0.8
 #define INACTIVE_COLOR		"#ededed"
 
=== modified file 'plugins/wacom/wacom.gresource.xml'
--- plugins/wacom/wacom.gresource.xml	2012-12-20 10:20:29 +0000
+++ plugins/wacom/wacom.gresource.xml	2020-03-06 20:26:03 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/settings-daemon/plugins/wacom">
+  <gresource prefix="/com/canonical/unity/settings-daemon/plugins/wacom">
     <file>tablet-layout.css</file>
   </gresource>
 </gresources>
 
=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2018-04-13 18:37:56 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2020-03-06 20:26:03 +0000
@@ -57,7 +57,7 @@
 
 #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
 
-#define CONF_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"
+#define CONF_SCHEMA "com.canonical.unity.settings-daemon.plugins.xrandr"
 #define CONF_KEY_DEFAULT_MONITORS_SETUP   "default-monitors-setup"
 #define CONF_KEY_DEFAULT_CONFIGURATION_FILE   "default-configuration-file"
 
 
=== modified file 'plugins/xsettings/gsd-xsettings-gtk.c'
--- plugins/xsettings/gsd-xsettings-gtk.c	2015-10-07 15:17:20 +0000
+++ plugins/xsettings/gsd-xsettings-gtk.c	2020-03-06 20:26:03 +0000
@@ -25,7 +25,7 @@
 
 #include "gsd-xsettings-gtk.h"
 
-#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
+#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
 
 #define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
 #define GTK_MODULES_ENABLED_KEY  "enabled-gtk-modules"
 
=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2017-10-03 05:07:39 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2020-03-06 20:26:03 +0000
@@ -48,14 +48,14 @@
 
 #define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))
 
-#define MOUSE_SETTINGS_SCHEMA     "org.gnome.settings-daemon.peripherals.mouse"
+#define MOUSE_SETTINGS_SCHEMA     "com.canonical.unity.settings-daemon.peripherals.mouse"
 #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
 #define UNITY_INTERFACE_SETTINGS_SCHEMA "com.ubuntu.user-interface.desktop"
 #define SOUND_SETTINGS_SCHEMA     "org.gnome.desktop.sound"
 #define PRIVACY_SETTINGS_SCHEMA     "org.gnome.desktop.privacy"
 #define WM_SETTINGS_SCHEMA        "org.gnome.desktop.wm.preferences"
 
-#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
+#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
 #define XSETTINGS_OVERRIDE_KEY  "overrides"
 
 #define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
@@ -367,8 +367,8 @@
 }
 
 static TranslationEntry translations [] = {
-        { "org.gnome.settings-daemon.peripherals.mouse", "double-click",   "Net/DoubleClickTime",  translate_int_int },
-        { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
+        { "com.canonical.unity.settings-daemon.peripherals.mouse", "double-click",   "Net/DoubleClickTime",  translate_int_int },
+        { "com.canonical.unity.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
 
         { "org.gnome.desktop.interface", "gtk-color-palette",      "Gtk/ColorPalette",        translate_string_string },
         { "org.gnome.desktop.interface", "font-name",              "Gtk/FontName",            translate_string_string },