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

Proposed by Khurshid Alam on 2020-03-06
Status: Merged
Approved by: Sebastien Bacher on 2020-03-11
Approved revision: 4201
Merged at revision: 4201
Proposed branch: lp:~khurshid-alam/unity-settings-daemon/usd-schemas-focal
Merge into: lp:unity-settings-daemon
Diff against target: 1636 lines (+1045/-74)
42 files modified
data/Makefile.am (+21/-1)
data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in (+182/-0)
data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in (+203/-0)
data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in (+55/-0)
data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in (+15/-0)
data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in (+167/-0)
data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in (+42/-0)
data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in (+15/-0)
data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in (+15/-0)
data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in (+144/-0)
data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in (+15/-0)
data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in (+22/-0)
data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in (+25/-0)
data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in (+45/-0)
data/gnome-settings-daemon.convert (+15/-15)
data/gsd-enums.h (+8/-0)
debian/control (+0/-1)
gnome-settings-daemon/gnome-settings-manager.c (+1/-1)
gnome-settings-daemon/main.c (+1/-1)
plugins/color/gsd-color-manager.c (+1/-1)
plugins/common/gsd-input-helper.c (+1/-1)
plugins/common/input-device-example.sh (+1/-1)
plugins/common/test-plugin.h (+4/-4)
plugins/housekeeping/gsd-disk-space.c (+1/-1)
plugins/housekeeping/gsd-ldsm-dialog.c (+1/-1)
plugins/keyboard/gsd-keyboard-manager.c (+7/-8)
plugins/media-keys/gsd-media-keys-manager.c (+2/-2)
plugins/mouse/gsd-mouse-manager.c (+6/-6)
plugins/orientation/gsd-orientation-manager.c (+1/-1)
plugins/power/gsd-power-manager.c (+2/-2)
plugins/power/test.py (+1/-1)
plugins/sharing/gsd-sharing-manager.c (+2/-2)
plugins/smartcard/gsd-smartcard-plugin.c (+1/-1)
plugins/updates/gsd-updates-common.h (+1/-1)
plugins/updates/gsd-updates-manager.c (+1/-1)
plugins/wacom/README.config-storage (+7/-7)
plugins/wacom/gsd-wacom-device.c (+6/-6)
plugins/wacom/gsd-wacom-osd-window.c (+1/-1)
plugins/wacom/wacom.gresource.xml (+1/-1)
plugins/xrandr/gsd-xrandr-manager.c (+1/-1)
plugins/xsettings/gsd-xsettings-gtk.c (+1/-1)
plugins/xsettings/gsd-xsettings-manager.c (+4/-4)
To merge this branch: bzr merge lp:~khurshid-alam/unity-settings-daemon/usd-schemas-focal
Reviewer Review Type Date Requested Status
Sebastien Bacher 2020-03-06 Approve on 2020-03-11
Review via email: mp+380379@code.launchpad.net

Commit message

* 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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2019-09-02 18:07:57 +0000
3+++ data/Makefile.am 2020-03-06 20:26:03 +0000
4@@ -3,7 +3,27 @@
5 apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon
6 api_DATA = gsd-enums.h
7
8-gschema_in_files = com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in
9+gsettings_ENUM_NAMESPACE = com.canonical.unity.settings-daemon
10+gsettings_ENUM_FILES = $(top_srcdir)/data/$(api_DATA)
11+
12+
13+gschema_in_files = \
14+ com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in \
15+ com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in \
16+ com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in \
17+ com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in \
18+ com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in \
19+ com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in \
20+ com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in \
21+ com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in \
22+ com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in \
23+ com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in \
24+ com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in \
25+ com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in \
26+ com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in \
27+ com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in
28+
29+
30 gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
31
32 gsettingsdir = $(datadir)/glib-2.0/schemas
33
34=== added file 'data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in'
35--- data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 1970-01-01 00:00:00 +0000
36+++ data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 2020-03-06 20:26:03 +0000
37@@ -0,0 +1,182 @@
38+<?xml version="1.0" encoding="UTF-8"?>
39+<schemalist>
40+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals" path="/com/canonical/unity/settings-daemon/peripherals/">
41+ <key name="priority" type="i">
42+ <default>0</default>
43+ <summary>Priority to use for this plugin</summary>
44+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
45+ </key>
46+ <key name="active" type="b">
47+ <default>true</default>
48+ <summary>Activation of this plugin</summary>
49+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
50+ </key>
51+ <child name="smartcard" schema="com.canonical.unity.settings-daemon.peripherals.smartcard"/>
52+ <child name="keyboard" schema="com.canonical.unity.settings-daemon.peripherals.keyboard"/>
53+ <child name="mouse" schema="com.canonical.unity.settings-daemon.peripherals.mouse"/>
54+ <child name="touchscreen" schema="com.canonical.unity.settings-daemon.peripherals.touchscreen"/>
55+ <child name="input-devices" schema="com.canonical.unity.settings-daemon.peripherals.input-devices"/>
56+ </schema>
57+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.smartcard" path="/com/canonical/unity/settings-daemon/peripherals/smartcard/">
58+ <key name="removal-action" enum="com.canonical.unity.settings-daemon.GsdSmartcardRemovalAction">
59+ <default>'none'</default>
60+ <summary>Smartcard removal action</summary>
61+ <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>
62+ </key>
63+ </schema>
64+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.keyboard" path="/com/canonical/unity/settings-daemon/peripherals/keyboard/">
65+ <key name="click" type="b">
66+ <default>true</default>
67+ </key>
68+ <key name="click-volume" type="i">
69+ <default>0</default>
70+ </key>
71+ <key name="bell-mode" enum="com.canonical.unity.settings-daemon.GsdBellMode">
72+ <default>'on'</default>
73+ <description>Possible values are “on”, “off”, and “custom”.</description>
74+ </key>
75+ <key name="bell-pitch" type="i">
76+ <default>400</default>
77+ </key>
78+ <key name="bell-duration" type="i">
79+ <default>100</default>
80+ </key>
81+ <key name="bell-custom-file" type="s">
82+ <default>''</default>
83+ <summary>Keyboard Bell Custom Filename</summary>
84+ <description>File name of the bell sound to be played.</description>
85+ </key>
86+ <key name="remember-numlock-state" type="b">
87+ <default>true</default>
88+ <summary>Remember NumLock state</summary>
89+ <description>When set to true, GNOME will remember the state of the NumLock LED between sessions.</description>
90+ </key>
91+ <key name="numlock-state" enum="com.canonical.unity.settings-daemon.GsdNumLockState">
92+ <default>'unknown'</default>
93+ <summary>NumLock state</summary>
94+ <description>The remembered state of the NumLock LED.</description>
95+ </key>
96+ </schema>
97+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.mouse" path="/com/canonical/unity/settings-daemon/peripherals/mouse/">
98+ <key name="locate-pointer" type="b">
99+ <default>false</default>
100+ <summary>Highlights the current location of the pointer when the Control key is pressed and released.</summary>
101+ </key>
102+ <key name="double-click" type="i">
103+ <default>400</default>
104+ <summary>Double click time</summary>
105+ <description> Length of a double click in milliseconds.</description>
106+ </key>
107+ <key name="drag-threshold" type="i">
108+ <default>8</default>
109+ <summary>Drag threshold</summary>
110+ <description>Distance before a drag is started.</description>
111+ </key>
112+ </schema>
113+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.touchscreen" path="/com/canonical/unity/settings-daemon/peripherals/touchscreen/">
114+ <key name="orientation-lock" type="b">
115+ <default>false</default>
116+ <summary>Whether the tablet’s orientation is locked, or rotated automatically.</summary>
117+ </key>
118+ </schema>
119+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.input-devices" path="/com/canonical/unity/settings-daemon/peripherals/input-devices/">
120+ <key name="hotplug-command" type="s">
121+ <default>''</default>
122+ <summary>Device hotplug custom command</summary>
123+ <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>
124+ </key>
125+ </schema>
126+
127+ <!-- Deprecated schemas/keys -->
128+ <schema id="com.canonical.unity.settings-daemon.peripherals.mouse.deprecated">
129+ <key name="left-handed" type="b">
130+ <default>false</default>
131+ <summary>Mouse button orientation</summary>
132+ <description>Swap left and right mouse buttons for left-handed mice.</description>
133+ </key>
134+ <key name="motion-acceleration" type="d">
135+ <default>-1</default>
136+ <summary>Single Click</summary>
137+ <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
138+ </key>
139+ <key name="motion-threshold" type="i">
140+ <default>-1</default>
141+ <summary>Motion Threshold</summary>
142+ <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
143+ </key>
144+ <key name="middle-button-enabled" type="b">
145+ <default>false</default>
146+ <summary>Middle button emulation</summary>
147+ <description>Enables middle mouse button emulation through simultaneous left and right button click.</description>
148+ </key>
149+ </schema>
150+ <schema id="com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated">
151+ <key name="repeat" type="b">
152+ <default>true</default>
153+ </key>
154+ <key name="repeat-interval" type="u">
155+ <default>30</default>
156+ <summary>Key Repeat Interval</summary>
157+ <description>Delay between repeats in milliseconds.</description>
158+ </key>
159+ <key name="delay" type="u">
160+ <default>500</default>
161+ <summary>Initial Key Repeat Delay</summary>
162+ <description>Initial key repeat delay in milliseconds.</description>
163+ </key>
164+ </schema>
165+ <schema id="com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated">
166+ <key name="disable-while-typing" type="b">
167+ <default>false</default>
168+ <summary>Disable touchpad while typing</summary>
169+ <description>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</description>
170+ </key>
171+ <key name="horiz-scroll-enabled" type="b">
172+ <default>true</default>
173+ <summary>Enable horizontal scrolling</summary>
174+ <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</description>
175+ </key>
176+ <key name="scroll-method" enum="com.canonical.unity.settings-daemon.GsdTouchpadScrollMethod">
177+ <default>'two-finger-scrolling'</default>
178+ <summary>Select the touchpad scroll method</summary>
179+ <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”, “two-finger-scrolling”.</description>
180+ </key>
181+ <key name="tap-to-click" type="b">
182+ <default>false</default>
183+ <summary>Enable mouse clicks with touchpad</summary>
184+ <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
185+ </key>
186+ <key name="touchpad-enabled" type="b">
187+ <default>true</default>
188+ <summary>Enable touchpad</summary>
189+ <description>Set this to TRUE to enable all touchpads.</description>
190+ </key>
191+ <key name="left-handed" enum="com.canonical.unity.settings-daemon.GsdTouchpadHandedness">
192+ <default>'mouse'</default>
193+ <summary>Touchpad button orientation</summary>
194+ <description>Swap left and right mouse buttons for left-handed mice with “left”, “right” for right-handed, “mouse” to follow the mouse setting.</description>
195+ </key>
196+ <key name="motion-acceleration" type="d">
197+ <default>-1</default>
198+ <summary>Single Click</summary>
199+ <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
200+ </key>
201+ <key name="motion-threshold" type="i">
202+ <default>-1</default>
203+ <summary>Motion Threshold</summary>
204+ <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
205+ </key>
206+ <key name="natural-scroll" type="b">
207+ <default>false</default>
208+ <summary>Natural scrolling</summary>
209+ <description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</description>
210+ </key>
211+ </schema>
212+ <schema id="com.canonical.unity.settings-daemon.peripherals.trackball.deprecated">
213+ <key name="scroll-wheel-emulation-button" type="i">
214+ <default>0</default>
215+ <range min="0" max="24"/>
216+ <summary>Mouse wheel emulation button. 0 to disable the feature.</summary>
217+ </key>
218+ </schema>
219+</schemalist>
220
221=== added file 'data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in'
222--- data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in 1970-01-01 00:00:00 +0000
223+++ data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in 2020-03-06 20:26:03 +0000
224@@ -0,0 +1,203 @@
225+<?xml version="1.0" encoding="UTF-8"?>
226+<schemalist>
227+ <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.deprecated">
228+ <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated"/>
229+ <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated"/>
230+
231+ <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
232+ <key name="is-absolute" type="b">
233+ <default>true</default>
234+ <summary>Wacom stylus absolute mode</summary>
235+ <description>Enable this to set the tablet to absolute mode.</description>
236+ </key>
237+ <key name="area" type="ai">
238+ <default>[-1, -1, -1, -1]</default>
239+ <summary>Wacom tablet area</summary>
240+ <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
241+ </key>
242+ <key name="keep-aspect" type="b">
243+ <default>false</default>
244+ <summary>Wacom tablet aspect ratio</summary>
245+ <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
246+ </key>
247+ <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
248+ <default>'none'</default>
249+ <summary>Wacom tablet rotation</summary>
250+ <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
251+ </key>
252+ <key name="touch" type="b">
253+ <default>true</default>
254+ <summary>Wacom touch feature</summary>
255+ <description>Enable this to move the cursor when the user touches the tablet.</description>
256+ </key>
257+ </schema>
258+ <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated">
259+ <key name="pressurecurve" type="ai">
260+ <default>[0, 0, 100, 100]</default>
261+ <summary>Wacom stylus pressure curve</summary>
262+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
263+ </key>
264+ <key name="buttonmapping" type="ai">
265+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
266+ <summary>Wacom stylus button mapping</summary>
267+ <description>Set this to the logical button mapping.</description>
268+ </key>
269+ <key name="pressurethreshold" type="i">
270+ <default>-1</default>
271+ <summary>Wacom stylus pressure threshold</summary>
272+ <description>Set this to the pressure value at which a stylus click event is generated.</description>
273+ </key>
274+ </schema>
275+ <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated">
276+ <key name="pressurecurve" type="ai">
277+ <default>[0, 0, 100, 100]</default>
278+ <summary>Wacom eraser pressure curve</summary>
279+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
280+ </key>
281+ <key name="buttonmapping" type="ai">
282+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
283+ <summary>Wacom eraser button mapping</summary>
284+ <description>Set this to the logical button mapping.</description>
285+ </key>
286+ <key name="pressurethreshold" type="i">
287+ <default>-1</default>
288+ <summary>Wacom eraser pressure threshold</summary>
289+ <description>Set this to the pressure value at which an eraser click event is generated.</description>
290+ </key>
291+ </schema>
292+ <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button.deprecated">
293+ <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
294+ <default>'none'</default>
295+ <summary>Wacom button action type</summary>
296+ <description>The type of action triggered by the button being pressed.</description>
297+ </key>
298+ <key name="custom-action" type="s">
299+ <default>''</default>
300+ <summary>Key combination for the custom action</summary>
301+ <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
302+ </key>
303+ <key name="custom-elevator-action" type="as">
304+ <default>['', '']</default>
305+ <summary>Key combinations for a touchring or touchstrip custom action</summary>
306+ <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
307+ </key>
308+ <key name="oled-label" type="s">
309+ <default>''</default>
310+ <!-- Translators: This is the OLED display on an Intuos4 tablet:
311+ http://eu.shop.wacom.eu/images/articles/d9abd9f2d4d88aa0649cda97a8077e2b_8.jpg -->
312+ <summary>Button label for OLED display.</summary>
313+ <description>Label will be rendered to OLED display belonging to the button</description>
314+ </key>
315+ </schema>
316+ <schema id="org.gnome.desktop.peripherals.tablet.deprecated">
317+ <key name="display" type="as">
318+ <default>["", "", ""]</default>
319+ </key>
320+ </schema>
321+
322+ <!-- The rest of this file is used by unity-settings-daemon only -->
323+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.gsdwacom" path="/com/canonical/unity/settings-daemon/plugins/gsdwacom/">
324+ <key name="priority" type="i">
325+ <default>0</default>
326+ <summary>Priority to use for this plugin</summary>
327+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
328+ </key>
329+ <key name="active" type="b">
330+ <default>true</default>
331+ <summary>Activation of this plugin</summary>
332+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
333+ </key>
334+ </schema>
335+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom">
336+ <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus"/>
337+ <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser"/>
338+
339+ <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
340+ <key name="is-absolute" type="b">
341+ <default>true</default>
342+ <summary>Wacom stylus absolute mode</summary>
343+ <description>Enable this to set the tablet to absolute mode for unity-settings-daemon.</description>
344+ </key>
345+ <key name="area" type="ai">
346+ <default>[-1, -1, -1, -1]</default>
347+ <summary>Wacom tablet area</summary>
348+ <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
349+ </key>
350+ <key name="keep-aspect" type="b">
351+ <default>false</default>
352+ <summary>Wacom tablet aspect ratio</summary>
353+ <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
354+ </key>
355+ <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
356+ <default>'none'</default>
357+ <summary>Wacom tablet rotation</summary>
358+ <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
359+ </key>
360+ <key name="touch" type="b">
361+ <default>true</default>
362+ <summary>Wacom touch feature</summary>
363+ <description>Enable this to move the cursor when the user touches the tablet.</description>
364+ </key>
365+ <key name="tablet-pc-button" type="b">
366+ <default>false</default>
367+ <summary>Wacom tablet PC feature</summary>
368+ <description>Enable this to only report stylus events when the tip is pressed.</description>
369+ </key>
370+ <key name="display" type="as">
371+ <default>["", "", ""]</default>
372+ <summary>Wacom display mapping</summary>
373+ <description>EDID information of monitor to map tablet to. Must be in the format [vendor, product, serial]. ["","",""] disables mapping.</description>
374+ </key>
375+ </schema>
376+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus">
377+ <key name="pressurecurve" type="ai">
378+ <default>[0, 0, 100, 100]</default>
379+ <summary>Wacom stylus pressure curve</summary>
380+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
381+ </key>
382+ <key name="buttonmapping" type="ai">
383+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
384+ <summary>Wacom stylus button mapping</summary>
385+ <description>Set this to the logical button mapping.</description>
386+ </key>
387+ <key name="pressurethreshold" type="i">
388+ <default>-1</default>
389+ <summary>Wacom stylus pressure threshold</summary>
390+ <description>Set this to the pressure value at which a stylus click event is generated.</description>
391+ </key>
392+ </schema>
393+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser">
394+ <key name="pressurecurve" type="ai">
395+ <default>[0, 0, 100, 100]</default>
396+ <summary>Wacom eraser pressure curve</summary>
397+ <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
398+ </key>
399+ <key name="buttonmapping" type="ai">
400+ <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
401+ <summary>Wacom eraser button mapping</summary>
402+ <description>Set this to the logical button mapping.</description>
403+ </key>
404+ <key name="pressurethreshold" type="i">
405+ <default>-1</default>
406+ <summary>Wacom eraser pressure threshold</summary>
407+ <description>Set this to the pressure value at which an eraser click event is generated.</description>
408+ </key>
409+ </schema>
410+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button">
411+ <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
412+ <default>'none'</default>
413+ <summary>Wacom button action type</summary>
414+ <description>The type of action triggered by the button being pressed.</description>
415+ </key>
416+ <key name="custom-action" type="s">
417+ <default>''</default>
418+ <summary>Key combination for the custom action</summary>
419+ <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
420+ </key>
421+ <key name="custom-elevator-action" type="as">
422+ <default>['', '']</default>
423+ <summary>Key combinations for a touchring or touchstrip custom action</summary>
424+ <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
425+ </key>
426+ </schema>
427+</schemalist>
428
429=== added file 'data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in'
430--- data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in 1970-01-01 00:00:00 +0000
431+++ data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in 2020-03-06 20:26:03 +0000
432@@ -0,0 +1,55 @@
433+<?xml version="1.0" encoding="UTF-8"?>
434+<schemalist>
435+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.color" path="/com/canonical/unity/settings-daemon/plugins/color/">
436+ <key name="priority" type="i">
437+ <default>0</default>
438+ <summary>Priority to use for this plugin</summary>
439+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
440+ </key>
441+ <key name="active" type="b">
442+ <default>true</default>
443+ <summary>Activation of this plugin</summary>
444+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
445+ </key>
446+ <key name="recalibrate-display-threshold" type="u">
447+ <default>0</default>
448+ <summary>The duration a display profile is valid</summary>
449+ <description>This is the number of days after which the display color profile is considered invalid.</description>
450+ </key>
451+ <key name="recalibrate-printer-threshold" type="u">
452+ <default>0</default>
453+ <summary>The duration a printer profile is valid</summary>
454+ <description>This is the number of days after which the printer color profile is considered invalid.</description>
455+ </key>
456+ <key name="night-light-enabled" type="b">
457+ <default>false</default>
458+ <summary>If the night light mode is enabled</summary>
459+ <description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
460+ </key>
461+ <key name="night-light-temperature" type="u">
462+ <default>4000</default>
463+ <summary>Temperature of the display when enabled</summary>
464+ <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>
465+ </key>
466+ <key name="night-light-schedule-automatic" type="b">
467+ <default>true</default>
468+ <summary>Use the sunrise and sunset</summary>
469+ <description>Calculate the sunrise and sunset times automatically, from the current location.</description>
470+ </key>
471+ <key name="night-light-schedule-from" type="d">
472+ <default>20.00</default>
473+ <summary>The start time</summary>
474+ <description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
475+ </key>
476+ <key name="night-light-schedule-to" type="d">
477+ <default>6.00</default>
478+ <summary>The end time</summary>
479+ <description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
480+ </key>
481+ <key name="night-light-last-coordinates" type="(dd)">
482+ <default>(91,181)</default>
483+ <summary>The last detected position</summary>
484+ <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>
485+ </key>
486+ </schema>
487+</schemalist>
488
489=== added file 'data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in'
490--- data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in 1970-01-01 00:00:00 +0000
491+++ data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in 2020-03-06 20:26:03 +0000
492@@ -0,0 +1,15 @@
493+<?xml version="1.0" encoding="UTF-8"?>
494+<schemalist>
495+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.datetime" path="/com/canonical/unity/settings-daemon/plugins/datetime/">
496+ <key name="priority" type="i">
497+ <default>0</default>
498+ <summary>Priority to use for this plugin</summary>
499+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
500+ </key>
501+ <key name="active" type="b">
502+ <default>true</default>
503+ <summary>Activation of this plugin</summary>
504+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
505+ </key>
506+ </schema>
507+</schemalist>
508
509=== added file 'data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in'
510--- data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in 1970-01-01 00:00:00 +0000
511+++ data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in 2020-03-06 20:26:03 +0000
512@@ -0,0 +1,167 @@
513+<?xml version="1.0" encoding="UTF-8"?>
514+<schemalist>
515+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins" path="/com/canonical/unity/settings-daemon/plugins/">
516+ <key name="whitelisted-plugins" type="as">
517+ <default>['all']</default>
518+ <summary>List of plugins that are allowed to be loaded</summary>
519+ <description>
520+ A list of strings representing the plugins that are allowed to be loaded (default: “all”).
521+ This is only evaluated on startup.
522+ </description>
523+ </key>
524+ <child name="a11y-keyboard" schema="com.canonical.unity.settings-daemon.plugins.a11y-keyboard"/>
525+ <child name="a11y-settings" schema="com.canonical.unity.settings-daemon.plugins.a11y-settings"/>
526+ <child name="background" schema="com.canonical.unity.settings-daemon.plugins.background"/>
527+ <child name="clipboard" schema="com.canonical.unity.settings-daemon.plugins.clipboard"/>
528+ <child name="color" schema="com.canonical.unity.settings-daemon.plugins.color"/>
529+ <child name="cursor" schema="com.canonical.unity.settings-daemon.plugins.cursor"/>
530+ <child name="datetime" schema="com.canonical.unity.settings-daemon.plugins.datetime"/>
531+ <child name="gsdwacom" schema="com.canonical.unity.settings-daemon.plugins.gsdwacom"/>
532+ <child name="housekeeping" schema="com.canonical.unity.settings-daemon.plugins.housekeeping"/>
533+ <child name="keyboard" schema="com.canonical.unity.settings-daemon.plugins.keyboard"/>
534+ <child name="media-keys" schema="com.canonical.unity.settings-daemon.plugins.media-keys"/>
535+ <child name="mouse" schema="com.canonical.unity.settings-daemon.plugins.mouse"/>
536+ <child name="orientation" schema="com.canonical.unity.settings-daemon.plugins.orientation"/>
537+ <child name="power" schema="com.canonical.unity.settings-daemon.plugins.power"/>
538+ <child name="print-notifications" schema="com.canonical.unity.settings-daemon.plugins.print-notifications"/>
539+ <child name="remote-display" schema="com.canonical.unity.settings-daemon.plugins.remote-display"/>
540+ <child name="screensaver-proxy" schema="com.canonical.unity.settings-daemon.plugins.screensaver-proxy"/>
541+ <child name="sharing" schema="com.canonical.unity.settings-daemon.plugins.sharing"/>
542+ <child name="smartcard" schema="com.canonical.unity.settings-daemon.plugins.smartcard"/>
543+ <child name="sound" schema="com.canonical.unity.settings-daemon.plugins.sound"/>
544+ <child name="xrandr" schema="com.canonical.unity.settings-daemon.plugins.xrandr"/>
545+ <child name="xsettings" schema="com.canonical.unity.settings-daemon.plugins.xsettings"/>
546+ </schema>
547+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-keyboard" path="/com/canonical/unity/settings-daemon/plugins/a11y-keyboard/">
548+ <key name="priority" type="i">
549+ <default>0</default>
550+ <summary>Priority to use for this plugin</summary>
551+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
552+ </key>
553+ <key name="active" type="b">
554+ <default>true</default>
555+ <summary>Activation of this plugin</summary>
556+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
557+ </key>
558+ </schema>
559+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-settings" path="/com/canonical/unity/settings-daemon/plugins/a11y-settings/">
560+ <key name="priority" type="i">
561+ <default>0</default>
562+ <summary>Priority to use for this plugin</summary>
563+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
564+ </key>
565+ <key name="active" type="b">
566+ <default>true</default>
567+ <summary>Activation of this plugin</summary>
568+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
569+ </key>
570+ </schema>
571+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.background" path="/com/canonical/unity/settings-daemon/plugins/background/">
572+ <key name="priority" type="i">
573+ <default>0</default>
574+ <summary>Priority to use for this plugin</summary>
575+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
576+ </key>
577+ <key name="active" type="b">
578+ <default>true</default>
579+ <summary>Activation of this plugin</summary>
580+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
581+ </key>
582+ </schema>
583+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.clipboard" path="/com/canonical/unity/settings-daemon/plugins/clipboard/">
584+ <key name="priority" type="i">
585+ <default>0</default>
586+ <summary>Priority to use for this plugin</summary>
587+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
588+ </key>
589+ <key name="active" type="b">
590+ <default>true</default>
591+ <summary>Activation of this plugin</summary>
592+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
593+ </key>
594+ </schema>
595+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.cursor" path="/com/canonical/unity/settings-daemon/plugins/cursor/">
596+ <key name="priority" type="i">
597+ <default>0</default>
598+ <summary>Priority to use for this plugin</summary>
599+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
600+ </key>
601+ <key name="active" type="b">
602+ <default>true</default>
603+ <summary>Activation of this plugin</summary>
604+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
605+ </key>
606+ </schema>
607+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.mouse" path="/com/canonical/unity/settings-daemon/plugins/mouse/">
608+ <key name="priority" type="i">
609+ <default>0</default>
610+ <summary>Priority to use for this plugin</summary>
611+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
612+ </key>
613+ <key name="active" type="b">
614+ <default>true</default>
615+ <summary>Activation of this plugin</summary>
616+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
617+ </key>
618+ </schema>
619+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.remote-display" path="/com/canonical/unity/settings-daemon/plugins/remote-display/">
620+ <key name="priority" type="i">
621+ <default>0</default>
622+ <summary>Priority to use for this plugin</summary>
623+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
624+ </key>
625+ <key name="active" type="b">
626+ <default>true</default>
627+ <summary>Activation of this plugin</summary>
628+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
629+ </key>
630+ </schema>
631+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.rfkill" path="/com/canonical/unity/settings-daemon/plugins/rfkill/">
632+ <key name="priority" type="i">
633+ <default>0</default>
634+ <summary>Priority to use for this plugin</summary>
635+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
636+ </key>
637+ <key name="active" type="b">
638+ <default>true</default>
639+ <summary>Activation of this plugin</summary>
640+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
641+ </key>
642+ </schema>
643+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.screensaver-proxy" path="/com/canonical/unity/settings-daemon/plugins/screensaver-proxy/">
644+ <key name="priority" type="i">
645+ <default>0</default>
646+ <summary>Priority to use for this plugin</summary>
647+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
648+ </key>
649+ <key name="active" type="b">
650+ <default>true</default>
651+ <summary>Activation of this plugin</summary>
652+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
653+ </key>
654+ </schema>
655+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.smartcard" path="/com/canonical/unity/settings-daemon/plugins/smartcard/">
656+ <key name="priority" type="i">
657+ <default>0</default>
658+ <summary>Priority to use for this plugin</summary>
659+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
660+ </key>
661+ <key name="active" type="b">
662+ <default>true</default>
663+ <summary>Activation of this plugin</summary>
664+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
665+ </key>
666+ </schema>
667+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sound" path="/com/canonical/unity/settings-daemon/plugins/sound/">
668+ <key name="priority" type="i">
669+ <default>0</default>
670+ <summary>Priority to use for this plugin</summary>
671+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
672+ </key>
673+ <key name="active" type="b">
674+ <default>true</default>
675+ <summary>Activation of this plugin</summary>
676+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
677+ </key>
678+ </schema>
679+</schemalist>
680
681=== added file 'data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in'
682--- data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in 1970-01-01 00:00:00 +0000
683+++ data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in 2020-03-06 20:26:03 +0000
684@@ -0,0 +1,42 @@
685+<?xml version="1.0" encoding="UTF-8"?>
686+<schemalist>
687+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.housekeeping" path="/com/canonical/unity/settings-daemon/plugins/housekeeping/">
688+ <key name="priority" type="i">
689+ <default>0</default>
690+ <summary>Priority to use for this plugin</summary>
691+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
692+ </key>
693+ <key name="active" type="b">
694+ <default>true</default>
695+ <summary>Activation of this plugin</summary>
696+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
697+ </key>
698+ <key name="ignore-paths" type="as">
699+ <default>[]</default>
700+ <summary>Mount paths to ignore</summary>
701+ <description>Specify a list of mount paths to ignore when they run low on space.</description>
702+ </key>
703+ <key name="free-percent-notify" type="d">
704+ <default>0.05</default>
705+ <range min="0.0" max="1.0"/>
706+ <summary>Free percentage notify threshold</summary>
707+ <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>
708+ </key>
709+ <key name="free-percent-notify-again" type="d">
710+ <default>0.01</default>
711+ <range min="0.0" max="1.0"/>
712+ <summary>Subsequent free space percentage notify threshold</summary>
713+ <description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</description>
714+ </key>
715+ <key name="free-size-gb-no-notify" type="i">
716+ <default>1</default>
717+ <summary>Free space notify threshold</summary>
718+ <description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</description>
719+ </key>
720+ <key name="min-notify-period" type="i">
721+ <default>10</default>
722+ <summary>Minimum notify period for repeated warnings</summary>
723+ <description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often than this period.</description>
724+ </key>
725+ </schema>
726+</schemalist>
727
728=== added file 'data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in'
729--- data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in 1970-01-01 00:00:00 +0000
730+++ data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in 2020-03-06 20:26:03 +0000
731@@ -0,0 +1,15 @@
732+<?xml version="1.0" encoding="UTF-8"?>
733+<schemalist>
734+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.keyboard" path="/com/canonical/unity/settings-daemon/plugins/keyboard/">
735+ <key name="priority" type="i">
736+ <default>0</default>
737+ <summary>Priority to use for this plugin</summary>
738+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
739+ </key>
740+ <key name="active" type="b">
741+ <default>true</default>
742+ <summary>Activation of this plugin</summary>
743+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
744+ </key>
745+ </schema>
746+</schemalist>
747
748=== added file 'data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in'
749--- data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in 1970-01-01 00:00:00 +0000
750+++ data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in 2020-03-06 20:26:03 +0000
751@@ -0,0 +1,15 @@
752+<?xml version="1.0" encoding="UTF-8"?>
753+<schemalist>
754+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.orientation" path="/com/canonical/unity/settings-daemon/plugins/orientation/">
755+ <key name="priority" type="i">
756+ <default>0</default>
757+ <summary>Priority to use for this plugin</summary>
758+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
759+ </key>
760+ <key name="active" type="b">
761+ <default>true</default>
762+ <summary>Activation of this plugin</summary>
763+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
764+ </key>
765+ </schema>
766+</schemalist>
767
768=== added file 'data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in'
769--- data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in 1970-01-01 00:00:00 +0000
770+++ data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in 2020-03-06 20:26:03 +0000
771@@ -0,0 +1,144 @@
772+<?xml version="1.0" encoding="UTF-8"?>
773+<schemalist>
774+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.power" path="/com/canonical/unity/settings-daemon/plugins/power/">
775+ <key name="priority" type="i">
776+ <default>0</default>
777+ <summary>Priority to use for this plugin</summary>
778+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
779+ </key>
780+ <key name="active" type="b">
781+ <default>true</default>
782+ <summary>Activation of this plugin</summary>
783+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
784+ </key>
785+ <key name="idle-brightness" type="i">
786+ <default>30</default>
787+ <summary>The brightness of the screen when idle</summary>
788+ <description>This is the laptop panel screen brightness used when the session is idle.</description>
789+ </key>
790+ <key name="idle-dim" type="b">
791+ <default>true</default>
792+ <summary>Dim the screen after a period of inactivity</summary>
793+ <description>If the screen should be dimmed to save power when the computer is idle.</description>
794+ </key>
795+ <key name="sleep-inactive-ac-timeout" type="i">
796+ <default>1200</default>
797+ <summary>Sleep timeout computer when on AC</summary>
798+ <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>
799+ </key>
800+ <key name="sleep-inactive-ac-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
801+ <default>'suspend'</default>
802+ <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
803+ <description>The type of sleeping that should be performed when the computer is inactive.</description>
804+ </key>
805+ <key name="sleep-inactive-battery-timeout" type="i">
806+ <default>1200</default>
807+ <summary>Sleep timeout computer when on battery</summary>
808+ <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>
809+ </key>
810+ <key name="sleep-inactive-battery-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
811+ <default>'suspend'</default>
812+ <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
813+ <description>The type of sleeping that should be performed when the computer is inactive.</description>
814+ </key>
815+ <!-- See http://bugzilla.gnome.org/637473 for rationale -->
816+ <key name="lid-close-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
817+ <default>'suspend'</default>
818+ <summary>Laptop lid close action on battery</summary>
819+ <description>The action to take when the laptop lid is closed and the laptop is on battery power.</description>
820+ </key>
821+ <key name="lid-close-ac-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
822+ <default>'suspend'</default>
823+ <summary>Laptop lid close action when on AC</summary>
824+ <description>The action to take when the laptop lid is closed and the laptop is on AC power.</description>
825+ </key>
826+ <key name="lid-close-suspend-with-external-monitor" type="b">
827+ <default>false</default>
828+ <summary>Laptop lid, when closed, will suspend even if there is an external monitor plugged in</summary>
829+ <description>With no external monitors plugged in, closing a laptop's lid
830+ will suspend the machine (as set by the lid-close-battery-action and
831+ lid-close-ac-action keys). By default, however, closing the lid when
832+ an external monitor is present will not suspend the machine, so that one can keep
833+ working on that monitor (e.g. for docking stations or media viewers). Set this
834+ key to False to keep the default behavior, or to True to suspend the laptop whenever the
835+ lid is closed and regardless of external monitors.</description>
836+ </key>
837+ <key name="ambient-enabled" type="b">
838+ <default>true</default>
839+ <summary>Enable the ALS sensor</summary>
840+ <description>If the ambient light sensor functionality is enabled.</description>
841+ </key>
842+ <key name="power-button-action" enum="com.canonical.unity.settings-daemon.GsdPowerButtonActionType">
843+ <default>'suspend'</default>
844+ <summary>Power button action</summary>
845+ <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>
846+ </key>
847+ <!-- Obsolete keys still used by unity-settings-daemon -->
848+ <key name="button-suspend" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
849+ <default>'suspend'</default>
850+ <summary>Suspend button action</summary>
851+ <description>The action to take when the system suspend button is pressed.</description>
852+ </key>
853+ <key name="button-hibernate" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
854+ <default>'hibernate'</default>
855+ <summary>Hibernate button action</summary>
856+ <description>The action to take when the system hibernate button is pressed.</description>
857+ </key>
858+ <key name="button-sleep" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
859+ <default>'hibernate'</default>
860+ <summary>Sleep button action</summary>
861+ <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
862+ </key>
863+ <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
864+ <key name="button-power" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
865+ <default>'suspend'</default>
866+ <summary>Power button action</summary>
867+ <description>The action to take when the system power button is pressed.</description>
868+ </key>
869+ <key name="critical-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
870+ <default>'hibernate'</default>
871+ <summary>Battery critical low action</summary>
872+ <description>The action to take when the battery is critically low.</description>
873+ </key>
874+ <key name="percentage-low" type="i">
875+ <default>10</default>
876+ <summary>Percentage considered low</summary>
877+ <description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</description>
878+ </key>
879+ <key name="percentage-critical" type="i">
880+ <default>3</default>
881+ <summary>Percentage considered critical</summary>
882+ <description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</description>
883+ </key>
884+ <key name="percentage-action" type="i">
885+ <default>2</default>
886+ <summary>Percentage action is taken</summary>
887+ <description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</description>
888+ </key>
889+ <key name="time-low" type="i">
890+ <default>1200</default>
891+ <summary>The time remaining when low</summary>
892+ <description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</description>
893+ </key>
894+ <key name="time-critical" type="i">
895+ <default>300</default>
896+ <summary>The time remaining when critical</summary>
897+ <description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</description>
898+ </key>
899+ <key name="time-action" type="i">
900+ <default>120</default>
901+ <summary>The time remaining when action is taken</summary>
902+ <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
903+ </key>
904+ <key name="use-time-for-policy" type="b">
905+ <default>true</default>
906+ <summary>Whether to use time-based notifications</summary>
907+ <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>
908+ </key>
909+ <key name="notify-perhaps-recall" type="b">
910+ <default>true</default>
911+ <summary>If we should show the recalled battery warning for a broken battery</summary>
912+ <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>
913+ </key>
914+ </schema>
915+</schemalist>
916
917=== added file 'data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in'
918--- data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in 1970-01-01 00:00:00 +0000
919+++ data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in 2020-03-06 20:26:03 +0000
920@@ -0,0 +1,15 @@
921+<?xml version="1.0" encoding="UTF-8"?>
922+<schemalist>
923+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.print-notifications" path="/com/canonical/unity/settings-daemon/plugins/print-notifications/">
924+ <key name="priority" type="i">
925+ <default>0</default>
926+ <summary>Priority to use for this plugin</summary>
927+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
928+ </key>
929+ <key name="active" type="b">
930+ <default>true</default>
931+ <summary>Activation of this plugin</summary>
932+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
933+ </key>
934+ </schema>
935+</schemalist>
936
937=== added file 'data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in'
938--- data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in 1970-01-01 00:00:00 +0000
939+++ data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in 2020-03-06 20:26:03 +0000
940@@ -0,0 +1,22 @@
941+<?xml version="1.0" encoding="UTF-8"?>
942+<schemalist>
943+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing" path="/com/canonical/unity/settings-daemon/plugins/sharing/">
944+ <key name="priority" type="i">
945+ <default>0</default>
946+ <summary>Priority to use for this plugin</summary>
947+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
948+ </key>
949+ <key name="active" type="b">
950+ <default>true</default>
951+ <summary>Activation of this plugin</summary>
952+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
953+ </key>
954+ </schema>
955+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing.service">
956+ <key name="enabled-connections" type="as">
957+ <default>[]</default>
958+ <summary>On which connections the service is enabled</summary>
959+ <description>The list of NetworkManager connections (each one represented with its UUID) on which this service is enabled and started.</description>
960+ </key>
961+ </schema>
962+</schemalist>
963
964=== added file 'data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in'
965--- data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in 1970-01-01 00:00:00 +0000
966+++ data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in 2020-03-06 20:26:03 +0000
967@@ -0,0 +1,25 @@
968+<?xml version="1.0" encoding="UTF-8"?>
969+<schemalist>
970+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xrandr" path="/com/canonical/unity/settings-daemon/plugins/xrandr/">
971+ <key name="default-configuration-file" type="s">
972+ <default>'/etc/gnome-settings-daemon/xrandr/monitors.xml'</default>
973+ <summary>File for default configuration for RandR</summary>
974+ <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>
975+ </key>
976+ <key name="default-monitors-setup" enum="com.canonical.unity.settings-daemon.GsdXrandrBootBehaviour">
977+ <default>'follow-lid'</default>
978+ <summary>Whether to turn off specific monitors after boot</summary>
979+ <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>
980+ </key>
981+ <key name="priority" type="i">
982+ <default>0</default>
983+ <summary>Priority to use for this plugin</summary>
984+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
985+ </key>
986+ <key name="active" type="b">
987+ <default>true</default>
988+ <summary>Activation of this plugin</summary>
989+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
990+ </key>
991+ </schema>
992+</schemalist>
993
994=== added file 'data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in'
995--- data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in 1970-01-01 00:00:00 +0000
996+++ data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in 2020-03-06 20:26:03 +0000
997@@ -0,0 +1,45 @@
998+<?xml version="1.0" encoding="UTF-8"?>
999+<schemalist>
1000+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xsettings" path="/com/canonical/unity/settings-daemon/plugins/xsettings/">
1001+ <key name="priority" type="i">
1002+ <default>0</default>
1003+ <summary>Priority to use for this plugin</summary>
1004+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
1005+ </key>
1006+ <key name="active" type="b">
1007+ <default>true</default>
1008+ <summary>Activation of this plugin</summary>
1009+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
1010+ </key>
1011+ <key name="antialiasing" enum="com.canonical.unity.settings-daemon.GsdFontAntialiasingMode">
1012+ <default>'grayscale'</default>
1013+ <summary>Antialiasing</summary>
1014+ <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>
1015+ </key>
1016+ <key name="hinting" enum="com.canonical.unity.settings-daemon.GsdFontHinting">
1017+ <default>'slight'</default>
1018+ <summary>Hinting</summary>
1019+ <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>
1020+ </key>
1021+ <key name="rgba-order" enum="com.canonical.unity.settings-daemon.GsdFontRgbaOrder">
1022+ <default>'rgb'</default>
1023+ <summary>RGBA order</summary>
1024+ <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>
1025+ </key>
1026+ <key name="disabled-gtk-modules" type="as">
1027+ <default>[]</default>
1028+ <summary>List of explicitly disabled GTK+ modules</summary>
1029+ <description>A list of strings representing the GTK+ modules that will not be loaded, even if enabled by default in their configuration.</description>
1030+ </key>
1031+ <key name="enabled-gtk-modules" type="as">
1032+ <default>[]</default>
1033+ <summary>List of explicitly enabled GTK+ modules</summary>
1034+ <description>A list of strings representing the GTK+ modules that will be loaded, usually in addition to conditional and forcibly disabled ones.</description>
1035+ </key>
1036+ <key type="a{sv}" name="overrides">
1037+ <default>{}</default>
1038+ <summary>A dictionary of XSETTINGS to override</summary>
1039+ <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>
1040+ </key>
1041+ </schema>
1042+</schemalist>
1043
1044=== modified file 'data/gnome-settings-daemon.convert'
1045--- data/gnome-settings-daemon.convert 2013-11-13 01:49:28 +0000
1046+++ data/gnome-settings-daemon.convert 2020-03-06 20:26:03 +0000
1047@@ -1,7 +1,7 @@
1048-[org.gnome.settings-daemon.peripherals.smartcard]
1049+[com.canonical.unity.settings-daemon.peripherals.smartcard]
1050 removal-action = /desktop/gnome/peripherals/smartcard/removal_action
1051
1052-[org.gnome.settings-daemon.peripherals.touchpad]
1053+[com.canonical.unity.settings-daemon.peripherals.touchpad]
1054 disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing
1055 horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled
1056 scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method
1057@@ -10,23 +10,23 @@
1058 motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
1059 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
1060
1061-[org.gnome.settings-daemon.plugins.a11y-keyboard]
1062+[com.canonical.unity.settings-daemon.plugins.a11y-keyboard]
1063 active = /apps/gnome_settings_daemon/plugins/a11y-keyboard/active
1064 priority = /apps/gnome_settings_daemon/plugins/a11y-keyboard/priority
1065
1066-[org.gnome.settings-daemon.plugins.background]
1067+[com.canonical.unity.settings-daemon.plugins.background]
1068 active = /apps/gnome_settings_daemon/plugins/background/active
1069 priority = /apps/gnome_settings_daemon/plugins/background/priority
1070
1071-[org.gnome.settings-daemon.plugins.clipboard]
1072+[com.canonical.unity.settings-daemon.plugins.clipboard]
1073 active = /apps/gnome_settings_daemon/plugins/clipboard/active
1074 priority = /apps/gnome_settings_daemon/plugins/clipboard/priority
1075
1076-[org.gnome.settings-daemon.plugins.font]
1077+[com.canonical.unity.settings-daemon.plugins.font]
1078 active = /apps/gnome_settings_daemon/plugins/font/active
1079 priority = /apps/gnome_settings_daemon/plugins/font/priority
1080
1081-[org.gnome.settings-daemon.plugins.housekeeping]
1082+[com.canonical.unity.settings-daemon.plugins.housekeeping]
1083 active = /apps/gnome_settings_daemon/plugins/housekeeping/active
1084 free-percent-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify
1085 free-percent-notify-again = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again
1086@@ -35,11 +35,11 @@
1087 min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_period
1088 priority = /apps/gnome_settings_daemon/plugins/housekeeping/priority
1089
1090-[org.gnome.settings-daemon.plugins.keyboard]
1091+[com.canonical.unity.settings-daemon.plugins.keyboard]
1092 active = /apps/gnome_settings_daemon/plugins/keyboard/active
1093 priority = /apps/gnome_settings_daemon/plugins/keyboard/priority
1094
1095-[org.gnome.settings-daemon.plugins.media-keys]
1096+[com.canonical.unity.settings-daemon.plugins.media-keys]
1097 active = /apps/gnome_settings_daemon/plugins/keybindings/active
1098 calculator = /apps/gnome_settings_daemon/keybindings/calculator
1099 email = /apps/gnome_settings_daemon/keybindings/email
1100@@ -65,11 +65,11 @@
1101 window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
1102 terminal = /apps/metacity/global_keybindings/run_command_terminal
1103
1104-[org.gnome.settings-daemon.plugins.mouse]
1105+[com.canonical.unity.settings-daemon.plugins.mouse]
1106 active = /apps/gnome_settings_daemon/plugins/mouse/active
1107 priority = /apps/gnome_settings_daemon/plugins/mouse/priority
1108
1109-[org.gnome.settings-daemon.peripherals.mouse]
1110+[com.canonical.unity.settings-daemon.peripherals.mouse]
1111 locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
1112 double-click = /desktop/gnome/peripherals/mouse/double_click
1113 drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
1114@@ -77,20 +77,20 @@
1115 motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
1116 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
1117
1118-[org.gnome.settings-daemon.plugins.smartcard]
1119+[com.canonical.unity.settings-daemon.plugins.smartcard]
1120 active = /apps/gnome_settings_daemon/plugins/smartcard/active
1121 priority = /apps/gnome_settings_daemon/plugins/smartcard/priority
1122
1123-[org.gnome.settings-daemon.plugins.sound]
1124+[com.canonical.unity.settings-daemon.plugins.sound]
1125 active = /apps/gnome_settings_daemon/plugins/sound/active
1126 priority = /apps/gnome_settings_daemon/plugins/sound/priority
1127
1128-[org.gnome.settings-daemon.plugins.xrandr]
1129+[com.canonical.unity.settings-daemon.plugins.xrandr]
1130 active = /apps/gnome_settings_daemon/plugins/xrandr/active
1131 default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
1132 priority = /apps/gnome_settings_daemon/plugins/xrandr/priority
1133
1134-[org.gnome.settings-daemon.plugins.xsettings]
1135+[com.canonical.unity.settings-daemon.plugins.xsettings]
1136 active = /apps/gnome_settings_daemon/plugins/xsettings/active
1137 antialiasing = /desktop/gnome/font_rendering/antialiasing
1138 hinting = /desktop/gnome/font_rendering/hinting
1139
1140=== modified file 'data/gsd-enums.h'
1141--- data/gsd-enums.h 2013-01-25 15:43:27 +0000
1142+++ data/gsd-enums.h 2020-03-06 20:26:03 +0000
1143@@ -112,6 +112,14 @@
1144
1145 typedef enum
1146 {
1147+ GSD_POWER_BUTTON_ACTION_NOTHING,
1148+ GSD_POWER_BUTTON_ACTION_SUSPEND,
1149+ GSD_POWER_BUTTON_ACTION_HIBERNATE,
1150+ GSD_POWER_BUTTON_ACTION_INTERACTIVE
1151+} GsdPowerButtonActionType;
1152+
1153+typedef enum
1154+{
1155 GSD_UPDATE_TYPE_ALL,
1156 GSD_UPDATE_TYPE_SECURITY,
1157 GSD_UPDATE_TYPE_NONE
1158
1159=== modified file 'debian/control'
1160--- debian/control 2020-02-23 15:03:25 +0000
1161+++ debian/control 2020-03-06 20:26:03 +0000
1162@@ -60,7 +60,6 @@
1163 gsettings-desktop-schemas (>= 3.15.4),
1164 nautilus-data (>= 2.91.3-1),
1165 unity-settings-daemon-schemas (>= ${source:Version}),
1166- gnome-settings-daemon-common (>= 3.16),
1167 gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
1168 Recommends: ibus (>= 1.5.0),
1169 pulseaudio,
1170
1171=== modified file 'gnome-settings-daemon/gnome-settings-manager.c'
1172--- gnome-settings-daemon/gnome-settings-manager.c 2016-06-02 07:50:58 +0000
1173+++ gnome-settings-daemon/gnome-settings-manager.c 2020-03-06 20:26:03 +0000
1174@@ -36,7 +36,7 @@
1175 #include "gnome-settings-profile.h"
1176 #include "gsd-pnp-ids.h"
1177
1178-#define DEFAULT_SETTINGS_PREFIX "org.gnome.settings-daemon"
1179+#define DEFAULT_SETTINGS_PREFIX "com.canonical.unity.settings-daemon"
1180
1181 #define PLUGIN_EXT ".gnome-settings-plugin"
1182
1183
1184=== modified file 'gnome-settings-daemon/main.c'
1185--- gnome-settings-daemon/main.c 2016-05-20 16:50:05 +0000
1186+++ gnome-settings-daemon/main.c 2020-03-06 20:26:03 +0000
1187@@ -264,7 +264,7 @@
1188 GSettings *settings;
1189 gboolean enabled;
1190
1191- settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard");
1192+ settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.keyboard");
1193 enabled = g_settings_get_boolean (settings, "active");
1194 g_object_unref (settings);
1195
1196
1197=== modified file 'plugins/color/gsd-color-manager.c'
1198--- plugins/color/gsd-color-manager.c 2016-05-20 21:20:36 +0000
1199+++ plugins/color/gsd-color-manager.c 2020-03-06 20:26:03 +0000
1200@@ -2164,7 +2164,7 @@
1201 /* use DMI data for internal panels */
1202 priv->dmi = gcm_dmi_new ();
1203
1204- priv->settings = g_settings_new ("org.gnome.settings-daemon.plugins.color");
1205+ priv->settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.color");
1206 priv->client = cd_client_new ();
1207 g_signal_connect (priv->client, "device-added",
1208 G_CALLBACK (gcm_session_device_added_notify_cb),
1209
1210=== modified file 'plugins/common/gsd-input-helper.c'
1211--- plugins/common/gsd-input-helper.c 2016-05-24 15:03:22 +0000
1212+++ plugins/common/gsd-input-helper.c 2020-03-06 20:26:03 +0000
1213@@ -31,7 +31,7 @@
1214
1215 #include "gsd-input-helper.h"
1216
1217-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
1218+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.peripherals.input-devices"
1219 #define KEY_HOTPLUG_COMMAND "hotplug-command"
1220
1221 #define ABS_MT_X "Abs MT Position X"
1222
1223=== modified file 'plugins/common/input-device-example.sh'
1224--- plugins/common/input-device-example.sh 2012-10-09 09:08:27 +0000
1225+++ plugins/common/input-device-example.sh 2020-03-06 20:26:03 +0000
1226@@ -16,7 +16,7 @@
1227 # ignored from future configuration.
1228 #
1229 # Set the script to be used with:
1230-# gsettings set org.gnome.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh
1231+# gsettings set com.canonical.unity.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh
1232 #
1233
1234 args=`getopt "t:i:" $*`
1235
1236=== modified file 'plugins/common/test-plugin.h'
1237--- plugins/common/test-plugin.h 2012-12-17 11:21:23 +0000
1238+++ plugins/common/test-plugin.h 2020-03-06 20:26:03 +0000
1239@@ -35,7 +35,7 @@
1240
1241 list = g_settings_list_schemas ();
1242 for (i = 0; list[i] != NULL; i++) {
1243- if (g_str_equal (list[i], "org.gnome.settings-daemon.plugins." SCHEMA_NAME))
1244+ if (g_str_equal (list[i], "com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME))
1245 return TRUE;
1246 }
1247 return FALSE;
1248@@ -45,9 +45,9 @@
1249 print_enable_disable_help (void)
1250 {
1251 fprintf (stderr, "To deactivate:\n");
1252- fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active false\n");
1253+ fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active false\n");
1254 fprintf (stderr, "To reactivate:\n");
1255- fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active true\n");
1256+ fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active true\n");
1257 }
1258
1259 int
1260@@ -73,7 +73,7 @@
1261 if (has_settings () == FALSE) {
1262 fprintf (stderr, "The schemas for plugin '%s' isn't available, check your installation.\n", SCHEMA_NAME);
1263 } else {
1264- settings = g_settings_new ("org.gnome.settings-daemon.plugins." SCHEMA_NAME);
1265+ settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME);
1266 if (g_settings_get_boolean (settings, "active") != FALSE) {
1267 fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);
1268 print_enable_disable_help ();
1269
1270=== modified file 'plugins/housekeeping/gsd-disk-space.c'
1271--- plugins/housekeeping/gsd-disk-space.c 2015-10-07 17:07:26 +0000
1272+++ plugins/housekeeping/gsd-disk-space.c 2020-03-06 20:26:03 +0000
1273@@ -45,7 +45,7 @@
1274
1275 #define DISK_SPACE_ANALYZER "baobab"
1276
1277-#define SETTINGS_HOUSEKEEPING_DIR "org.gnome.settings-daemon.plugins.housekeeping"
1278+#define SETTINGS_HOUSEKEEPING_DIR "com.canonical.unity.settings-daemon.plugins.housekeeping"
1279 #define SETTINGS_FREE_PC_NOTIFY_KEY "free-percent-notify"
1280 #define SETTINGS_FREE_PC_NOTIFY_AGAIN_KEY "free-percent-notify-again"
1281 #define SETTINGS_FREE_SIZE_NO_NOTIFY "free-size-gb-no-notify"
1282
1283=== modified file 'plugins/housekeeping/gsd-ldsm-dialog.c'
1284--- plugins/housekeeping/gsd-ldsm-dialog.c 2015-02-05 11:01:43 +0000
1285+++ plugins/housekeeping/gsd-ldsm-dialog.c 2020-03-06 20:26:03 +0000
1286@@ -24,7 +24,7 @@
1287
1288 #include "gsd-ldsm-dialog.h"
1289
1290-#define SETTINGS_HOUSEKEEPING_DIR "org.gnome.settings-daemon.plugins.housekeeping"
1291+#define SETTINGS_HOUSEKEEPING_DIR "com.canonical.unity.settings-daemon.plugins.housekeeping"
1292
1293 enum
1294 {
1295
1296=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
1297--- plugins/keyboard/gsd-keyboard-manager.c 2019-09-01 15:22:44 +0000
1298+++ plugins/keyboard/gsd-keyboard-manager.c 2020-03-06 20:26:03 +0000
1299@@ -69,7 +69,7 @@
1300
1301 #define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
1302
1303-#define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"
1304+#define GSD_KEYBOARD_DIR "com.canonical.unity.settings-daemon.peripherals.keyboard"
1305 #define GSETTINGS_KEYBOARD_SCHEMA "org.gnome.desktop.peripherals.keyboard"
1306
1307 #define KEY_REPEAT "repeat"
1308@@ -685,7 +685,7 @@
1309 g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
1310 num_lock_state_to_string (numlock_state),
1311 num_lock_state_to_string (manager->priv->old_state));
1312- g_settings_set_enum (manager->priv->gsettings,
1313+ g_settings_set_enum (manager->priv->settings,
1314 KEY_NUMLOCK_STATE,
1315 numlock_state);
1316 manager->priv->old_state = numlock_state;
1317@@ -1793,9 +1793,9 @@
1318 gboolean rnumlock;
1319
1320 g_debug ("Applying the num-lock settings");
1321- settings = manager->priv->gsettings;
1322+ settings = manager->priv->settings;
1323 rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE);
1324- manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE);
1325+ manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
1326
1327 gdk_error_trap_push ();
1328 if (rnumlock) {
1329@@ -2629,12 +2629,11 @@
1330 GsdSettingsMigrateEntry entries[] = {
1331 { "repeat", "repeat", NULL },
1332 { "repeat-interval", "repeat-interval", NULL },
1333- { "delay", "delay", NULL },
1334- { "remember-numlock-state", "remember-numlock-state", NULL },
1335+ { "delay", "delay", NULL }
1336 };
1337
1338- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",
1339- "/org/gnome/settings-daemon/peripherals/keyboard/",
1340+ gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated",
1341+ "/com/canonical/unity/settings-daemon/peripherals/keyboard/",
1342 "org.gnome.desktop.peripherals.keyboard",
1343 "/org/gnome/desktop/peripherals/keyboard/",
1344 entries, G_N_ELEMENTS (entries));
1345
1346=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
1347--- plugins/media-keys/gsd-media-keys-manager.c 2018-11-30 10:40:30 +0000
1348+++ plugins/media-keys/gsd-media-keys-manager.c 2020-03-06 20:26:03 +0000
1349@@ -110,8 +110,8 @@
1350 "</node>";
1351
1352 #define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface"
1353-#define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
1354-#define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
1355+#define SETTINGS_POWER_DIR "com.canonical.unity.settings-daemon.plugins.power"
1356+#define SETTINGS_XSETTINGS_DIR "com.canonical.unity.settings-daemon.plugins.xsettings"
1357 #define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
1358 #define UNITY_SETTINGS_INTERFACE_DIR "com.canonical.Unity.Interface"
1359
1360
1361=== modified file 'plugins/mouse/gsd-mouse-manager.c'
1362--- plugins/mouse/gsd-mouse-manager.c 2019-09-01 15:22:44 +0000
1363+++ plugins/mouse/gsd-mouse-manager.c 2020-03-06 20:26:03 +0000
1364@@ -1401,18 +1401,18 @@
1365 { "natural-scroll", "natural-scroll", NULL }
1366 };
1367
1368- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.trackball.deprecated",
1369- "/org/gnome/settings-daemon/peripherals/trackball/",
1370+ gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.trackball.deprecated",
1371+ "/com/canonical/unity/settings-daemon/peripherals/trackball/",
1372 "org.gnome.desktop.peripherals.trackball",
1373 "/org/gnome/desktop/peripherals/trackball/",
1374 trackball_entries, G_N_ELEMENTS (trackball_entries));
1375- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.mouse.deprecated",
1376- "/org/gnome/settings-daemon/peripherals/mouse/",
1377+ gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.mouse.deprecated",
1378+ "/com/canonical/unity/settings-daemon/peripherals/mouse/",
1379 "org.gnome.desktop.peripherals.mouse",
1380 "/org/gnome/desktop/peripherals/mouse/",
1381 mouse_entries, G_N_ELEMENTS (mouse_entries));
1382- gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.touchpad.deprecated",
1383- "/org/gnome/settings-daemon/peripherals/touchpad/",
1384+ gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated",
1385+ "/com/canonical/unity/settings-daemon/peripherals/touchpad/",
1386 "org.gnome.desktop.peripherals.touchpad",
1387 "/org/gnome/desktop/peripherals/touchpad/",
1388 touchpad_entries, G_N_ELEMENTS (touchpad_entries));
1389
1390=== modified file 'plugins/orientation/gsd-orientation-manager.c'
1391--- plugins/orientation/gsd-orientation-manager.c 2015-10-07 16:12:45 +0000
1392+++ plugins/orientation/gsd-orientation-manager.c 2020-03-06 20:26:03 +0000
1393@@ -67,7 +67,7 @@
1394 gboolean orientation_lock;
1395 };
1396
1397-#define CONF_SCHEMA "org.gnome.settings-daemon.peripherals.touchscreen"
1398+#define CONF_SCHEMA "com.canonical.unity.settings-daemon.peripherals.touchscreen"
1399 #define ORIENTATION_LOCK_KEY "orientation-lock"
1400
1401 #define GSD_ORIENTATION_DBUS_NAME GSD_DBUS_NAME ".Orientation"
1402
1403=== modified file 'plugins/power/gsd-power-manager.c'
1404--- plugins/power/gsd-power-manager.c 2019-06-23 08:50:48 +0000
1405+++ plugins/power/gsd-power-manager.c 2020-03-06 20:26:03 +0000
1406@@ -59,8 +59,8 @@
1407 #define UPOWER_DBUS_INTERFACE "org.freedesktop.UPower"
1408 #define UPOWER_DBUS_INTERFACE_KBDBACKLIGHT "org.freedesktop.UPower.KbdBacklight"
1409
1410-#define GSD_POWER_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.power"
1411-#define GSD_XRANDR_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"
1412+#define GSD_POWER_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.power"
1413+#define GSD_XRANDR_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.xrandr"
1414
1415 #define GSD_POWER_DBUS_NAME GSD_DBUS_NAME ".Power"
1416 #define GSD_POWER_DBUS_PATH GSD_DBUS_PATH "/Power"
1417
1418=== modified file 'plugins/power/test.py'
1419--- plugins/power/test.py 2013-12-04 23:55:26 +0000
1420+++ plugins/power/test.py 2020-03-06 20:26:03 +0000
1421@@ -76,7 +76,7 @@
1422 self.settings_screensaver = Gio.Settings('org.gnome.desktop.screensaver')
1423 self.settings_screensaver['lock-enabled'] = False
1424
1425- self.settings_gsd_power = Gio.Settings('org.gnome.settings-daemon.plugins.power')
1426+ self.settings_gsd_power = Gio.Settings('com.canonical.unity.settings-daemon.plugins.power')
1427
1428 # start power plugin
1429 self.settings_gsd_power['active'] = False
1430
1431=== modified file 'plugins/sharing/gsd-sharing-manager.c'
1432--- plugins/sharing/gsd-sharing-manager.c 2018-02-21 21:19:43 +0000
1433+++ plugins/sharing/gsd-sharing-manager.c 2020-03-06 20:26:03 +0000
1434@@ -780,8 +780,8 @@
1435
1436 service = g_new0 (ServiceInfo, 1);
1437 service->name = services[i];
1438- path = g_strdup_printf ("/org/gnome/settings-daemon/plugins/sharing/%s/", services[i]);
1439- service->settings = g_settings_new_with_path ("org.gnome.settings-daemon.plugins.sharing.service", path);
1440+ path = g_strdup_printf ("/com/canonical/unity/settings-daemon/plugins/sharing/%s/", services[i]);
1441+ service->settings = g_settings_new_with_path ("com.canonical.unity.settings-daemon.plugins.sharing.service", path);
1442 g_free (path);
1443
1444 g_hash_table_insert (manager->priv->services, (gpointer) services[i], service);
1445
1446=== modified file 'plugins/smartcard/gsd-smartcard-plugin.c'
1447--- plugins/smartcard/gsd-smartcard-plugin.c 2016-05-20 21:21:08 +0000
1448+++ plugins/smartcard/gsd-smartcard-plugin.c 2020-03-06 20:26:03 +0000
1449@@ -163,7 +163,7 @@
1450 char *remove_action_string;
1451 GsdSmartcardRemoveAction remove_action;
1452
1453- settings = g_settings_new ("org.gnome.settings-daemon.peripherals.smartcard");
1454+ settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.smartcard");
1455 remove_action_string = g_settings_get_string (settings, KEY_REMOVE_ACTION);
1456
1457 if (remove_action_string == NULL) {
1458
1459=== modified file 'plugins/updates/gsd-updates-common.h'
1460--- plugins/updates/gsd-updates-common.h 2017-03-28 08:17:41 +0000
1461+++ plugins/updates/gsd-updates-common.h 2020-03-06 20:26:03 +0000
1462@@ -35,7 +35,7 @@
1463 #define GSD_SETTINGS_LAST_UPDATES_NOTIFICATION "last-updates-notification"
1464 #define GSD_SETTINGS_MEDIA_REPO_FILENAMES "media-repo-filenames"
1465 #define GSD_SETTINGS_NOTIFY_DISTRO_UPGRADES "notify-distro-upgrades"
1466-#define GSD_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.updates"
1467+#define GSD_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.updates"
1468 #define GSD_SETTINGS_UPDATE_BATTERY "update-battery"
1469 #define GSD_SETTINGS_AUTO_DOWNLOAD_UPDATES "auto-download-updates"
1470
1471
1472=== modified file 'plugins/updates/gsd-updates-manager.c'
1473--- plugins/updates/gsd-updates-manager.c 2018-02-14 12:40:59 +0000
1474+++ plugins/updates/gsd-updates-manager.c 2020-03-06 20:26:03 +0000
1475@@ -1322,7 +1322,7 @@
1476 G_CALLBACK (settings_changed_cb), manager);
1477
1478 /* get ftp settings */
1479- manager->priv->settings_gsd = g_settings_new ("org.gnome.settings-daemon.plugins.updates");
1480+ manager->priv->settings_gsd = g_settings_new ("com.canonical.unity.settings-daemon.plugins.updates");
1481 g_signal_connect (manager->priv->settings_gsd, "changed",
1482 G_CALLBACK (settings_gsd_changed_cb), manager);
1483
1484
1485=== modified file 'plugins/wacom/README.config-storage'
1486--- plugins/wacom/README.config-storage 2012-04-25 12:40:32 +0000
1487+++ plugins/wacom/README.config-storage 2020-03-06 20:26:03 +0000
1488@@ -12,8 +12,8 @@
1489 configurations, whether on a single machine, or using a shared home directory.
1490
1491 The configuration scheme is:
1492-schema: org.gnome.settings-daemon.peripherals.wacom
1493-path: /org/gnome/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/
1494+schema: com.canonical.unity.settings-daemon.peripherals.wacom
1495+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/
1496
1497 where <machine ID> is the D-Bus machine-id for the machine, and
1498 <device ID> is a unique identifier for the tablet.
1499@@ -25,10 +25,10 @@
1500 is the tool ID, for professional ranges, and a generic identifier for
1501 the consumer ranges that do not support tool ID.
1502
1503-schema: org.gnome.settings-daemon.peripherals.wacom.stylus
1504-or: org.gnome.settings-daemon.peripherals.wacom.eraser
1505+schema: com.canonical.unity.settings-daemon.peripherals.wacom.stylus
1506+or: com.canonical.unity.settings-daemon.peripherals.wacom.eraser
1507
1508-path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/
1509+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/
1510
1511 So each tool can be configured per tablet (so the compatible airbrush stylus
1512 will have different configurations on a Cintiq and an Intuos tablet)
1513@@ -36,8 +36,8 @@
1514 Buttons
1515 -------
1516
1517-schema: org.gnome.settings-daemon.peripherals.wacom.tablet-button
1518-path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<button ID>
1519+schema: com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button
1520+path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<button ID>
1521
1522 Testing
1523 -------
1524
1525=== modified file 'plugins/wacom/gsd-wacom-device.c'
1526--- plugins/wacom/gsd-wacom-device.c 2015-10-07 16:32:40 +0000
1527+++ plugins/wacom/gsd-wacom-device.c 2020-03-06 20:26:03 +0000
1528@@ -40,11 +40,11 @@
1529
1530 #define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
1531
1532-#define WACOM_TABLET_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
1533-#define WACOM_DEVICE_CONFIG_BASE "/org/gnome/settings-daemon/peripherals/wacom/%s-%s/"
1534-#define WACOM_STYLUS_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.stylus"
1535-#define WACOM_ERASER_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.eraser"
1536-#define WACOM_BUTTON_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.tablet-button"
1537+#define WACOM_TABLET_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom"
1538+#define WACOM_DEVICE_CONFIG_BASE "/com/canonical/unity/settings-daemon/peripherals/wacom/%s-%s/"
1539+#define WACOM_STYLUS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.stylus"
1540+#define WACOM_ERASER_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.eraser"
1541+#define WACOM_BUTTON_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button"
1542
1543 static struct {
1544 GsdRRRotation rotation;
1545@@ -316,7 +316,7 @@
1546 * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
1547 * Tool-specific settings: applied to one tool only.
1548 */
1549-#define SETTINGS_WACOM_DIR "org.gnome.settings-daemon.peripherals.wacom"
1550+#define SETTINGS_WACOM_DIR "com.canonical.unity.settings-daemon.peripherals.wacom"
1551 #define SETTINGS_STYLUS_DIR "stylus"
1552 #define SETTINGS_ERASER_DIR "eraser"
1553
1554
1555=== modified file 'plugins/wacom/gsd-wacom-osd-window.c'
1556--- plugins/wacom/gsd-wacom-osd-window.c 2013-10-04 07:53:20 +0000
1557+++ plugins/wacom/gsd-wacom-osd-window.c 2020-03-06 20:26:03 +0000
1558@@ -36,7 +36,7 @@
1559 #define ACTION_TYPE_KEY "action-type"
1560 #define CUSTOM_ACTION_KEY "custom-action"
1561 #define CUSTOM_ELEVATOR_ACTION_KEY "custom-elevator-action"
1562-#define RES_PATH "/org/gnome/settings-daemon/plugins/wacom/"
1563+#define RES_PATH "/com/canonical/unity/settings-daemon/plugins/wacom/"
1564
1565 #define BACK_OPACITY 0.8
1566 #define INACTIVE_COLOR "#ededed"
1567
1568=== modified file 'plugins/wacom/wacom.gresource.xml'
1569--- plugins/wacom/wacom.gresource.xml 2012-12-20 10:20:29 +0000
1570+++ plugins/wacom/wacom.gresource.xml 2020-03-06 20:26:03 +0000
1571@@ -1,6 +1,6 @@
1572 <?xml version="1.0" encoding="UTF-8"?>
1573 <gresources>
1574- <gresource prefix="/org/gnome/settings-daemon/plugins/wacom">
1575+ <gresource prefix="/com/canonical/unity/settings-daemon/plugins/wacom">
1576 <file>tablet-layout.css</file>
1577 </gresource>
1578 </gresources>
1579
1580=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
1581--- plugins/xrandr/gsd-xrandr-manager.c 2018-04-13 18:37:56 +0000
1582+++ plugins/xrandr/gsd-xrandr-manager.c 2020-03-06 20:26:03 +0000
1583@@ -57,7 +57,7 @@
1584
1585 #define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
1586
1587-#define CONF_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"
1588+#define CONF_SCHEMA "com.canonical.unity.settings-daemon.plugins.xrandr"
1589 #define CONF_KEY_DEFAULT_MONITORS_SETUP "default-monitors-setup"
1590 #define CONF_KEY_DEFAULT_CONFIGURATION_FILE "default-configuration-file"
1591
1592
1593=== modified file 'plugins/xsettings/gsd-xsettings-gtk.c'
1594--- plugins/xsettings/gsd-xsettings-gtk.c 2015-10-07 15:17:20 +0000
1595+++ plugins/xsettings/gsd-xsettings-gtk.c 2020-03-06 20:26:03 +0000
1596@@ -25,7 +25,7 @@
1597
1598 #include "gsd-xsettings-gtk.h"
1599
1600-#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
1601+#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
1602
1603 #define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
1604 #define GTK_MODULES_ENABLED_KEY "enabled-gtk-modules"
1605
1606=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
1607--- plugins/xsettings/gsd-xsettings-manager.c 2017-10-03 05:07:39 +0000
1608+++ plugins/xsettings/gsd-xsettings-manager.c 2020-03-06 20:26:03 +0000
1609@@ -48,14 +48,14 @@
1610
1611 #define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))
1612
1613-#define MOUSE_SETTINGS_SCHEMA "org.gnome.settings-daemon.peripherals.mouse"
1614+#define MOUSE_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.mouse"
1615 #define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
1616 #define UNITY_INTERFACE_SETTINGS_SCHEMA "com.ubuntu.user-interface.desktop"
1617 #define SOUND_SETTINGS_SCHEMA "org.gnome.desktop.sound"
1618 #define PRIVACY_SETTINGS_SCHEMA "org.gnome.desktop.privacy"
1619 #define WM_SETTINGS_SCHEMA "org.gnome.desktop.wm.preferences"
1620
1621-#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
1622+#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
1623 #define XSETTINGS_OVERRIDE_KEY "overrides"
1624
1625 #define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
1626@@ -367,8 +367,8 @@
1627 }
1628
1629 static TranslationEntry translations [] = {
1630- { "org.gnome.settings-daemon.peripherals.mouse", "double-click", "Net/DoubleClickTime", translate_int_int },
1631- { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
1632+ { "com.canonical.unity.settings-daemon.peripherals.mouse", "double-click", "Net/DoubleClickTime", translate_int_int },
1633+ { "com.canonical.unity.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
1634
1635 { "org.gnome.desktop.interface", "gtk-color-palette", "Gtk/ColorPalette", translate_string_string },
1636 { "org.gnome.desktop.interface", "font-name", "Gtk/FontName", translate_string_string },

Subscribers

People subscribed via source and target branches