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
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2019-09-02 18:07:57 +0000
+++ data/Makefile.am 2020-03-06 20:26:03 +0000
@@ -3,7 +3,27 @@
3apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon3apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon
4api_DATA = gsd-enums.h4api_DATA = gsd-enums.h
55
6gschema_in_files = com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in6gsettings_ENUM_NAMESPACE = com.canonical.unity.settings-daemon
7gsettings_ENUM_FILES = $(top_srcdir)/data/$(api_DATA)
8
9
10gschema_in_files = \
11 com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in \
12 com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in \
13 com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in \
14 com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in \
15 com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in \
16 com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in \
17 com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in \
18 com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in \
19 com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in \
20 com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in \
21 com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in \
22 com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in \
23 com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in \
24 com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in
25
26
7gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)27gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
828
9gsettingsdir = $(datadir)/glib-2.0/schemas29gsettingsdir = $(datadir)/glib-2.0/schemas
1030
=== added file 'data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,182 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals" path="/com/canonical/unity/settings-daemon/peripherals/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 <child name="smartcard" schema="com.canonical.unity.settings-daemon.peripherals.smartcard"/>
15 <child name="keyboard" schema="com.canonical.unity.settings-daemon.peripherals.keyboard"/>
16 <child name="mouse" schema="com.canonical.unity.settings-daemon.peripherals.mouse"/>
17 <child name="touchscreen" schema="com.canonical.unity.settings-daemon.peripherals.touchscreen"/>
18 <child name="input-devices" schema="com.canonical.unity.settings-daemon.peripherals.input-devices"/>
19 </schema>
20 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.smartcard" path="/com/canonical/unity/settings-daemon/peripherals/smartcard/">
21 <key name="removal-action" enum="com.canonical.unity.settings-daemon.GsdSmartcardRemovalAction">
22 <default>'none'</default>
23 <summary>Smartcard removal action</summary>
24 <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>
25 </key>
26 </schema>
27 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.keyboard" path="/com/canonical/unity/settings-daemon/peripherals/keyboard/">
28 <key name="click" type="b">
29 <default>true</default>
30 </key>
31 <key name="click-volume" type="i">
32 <default>0</default>
33 </key>
34 <key name="bell-mode" enum="com.canonical.unity.settings-daemon.GsdBellMode">
35 <default>'on'</default>
36 <description>Possible values are “on”, “off”, and “custom”.</description>
37 </key>
38 <key name="bell-pitch" type="i">
39 <default>400</default>
40 </key>
41 <key name="bell-duration" type="i">
42 <default>100</default>
43 </key>
44 <key name="bell-custom-file" type="s">
45 <default>''</default>
46 <summary>Keyboard Bell Custom Filename</summary>
47 <description>File name of the bell sound to be played.</description>
48 </key>
49 <key name="remember-numlock-state" type="b">
50 <default>true</default>
51 <summary>Remember NumLock state</summary>
52 <description>When set to true, GNOME will remember the state of the NumLock LED between sessions.</description>
53 </key>
54 <key name="numlock-state" enum="com.canonical.unity.settings-daemon.GsdNumLockState">
55 <default>'unknown'</default>
56 <summary>NumLock state</summary>
57 <description>The remembered state of the NumLock LED.</description>
58 </key>
59 </schema>
60 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.mouse" path="/com/canonical/unity/settings-daemon/peripherals/mouse/">
61 <key name="locate-pointer" type="b">
62 <default>false</default>
63 <summary>Highlights the current location of the pointer when the Control key is pressed and released.</summary>
64 </key>
65 <key name="double-click" type="i">
66 <default>400</default>
67 <summary>Double click time</summary>
68 <description> Length of a double click in milliseconds.</description>
69 </key>
70 <key name="drag-threshold" type="i">
71 <default>8</default>
72 <summary>Drag threshold</summary>
73 <description>Distance before a drag is started.</description>
74 </key>
75 </schema>
76 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.touchscreen" path="/com/canonical/unity/settings-daemon/peripherals/touchscreen/">
77 <key name="orientation-lock" type="b">
78 <default>false</default>
79 <summary>Whether the tablet’s orientation is locked, or rotated automatically.</summary>
80 </key>
81 </schema>
82 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.input-devices" path="/com/canonical/unity/settings-daemon/peripherals/input-devices/">
83 <key name="hotplug-command" type="s">
84 <default>''</default>
85 <summary>Device hotplug custom command</summary>
86 <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>
87 </key>
88 </schema>
89
90 <!-- Deprecated schemas/keys -->
91 <schema id="com.canonical.unity.settings-daemon.peripherals.mouse.deprecated">
92 <key name="left-handed" type="b">
93 <default>false</default>
94 <summary>Mouse button orientation</summary>
95 <description>Swap left and right mouse buttons for left-handed mice.</description>
96 </key>
97 <key name="motion-acceleration" type="d">
98 <default>-1</default>
99 <summary>Single Click</summary>
100 <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
101 </key>
102 <key name="motion-threshold" type="i">
103 <default>-1</default>
104 <summary>Motion Threshold</summary>
105 <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
106 </key>
107 <key name="middle-button-enabled" type="b">
108 <default>false</default>
109 <summary>Middle button emulation</summary>
110 <description>Enables middle mouse button emulation through simultaneous left and right button click.</description>
111 </key>
112 </schema>
113 <schema id="com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated">
114 <key name="repeat" type="b">
115 <default>true</default>
116 </key>
117 <key name="repeat-interval" type="u">
118 <default>30</default>
119 <summary>Key Repeat Interval</summary>
120 <description>Delay between repeats in milliseconds.</description>
121 </key>
122 <key name="delay" type="u">
123 <default>500</default>
124 <summary>Initial Key Repeat Delay</summary>
125 <description>Initial key repeat delay in milliseconds.</description>
126 </key>
127 </schema>
128 <schema id="com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated">
129 <key name="disable-while-typing" type="b">
130 <default>false</default>
131 <summary>Disable touchpad while typing</summary>
132 <description>Set this to TRUE if you have problems with accidentally hitting the touchpad while typing.</description>
133 </key>
134 <key name="horiz-scroll-enabled" type="b">
135 <default>true</default>
136 <summary>Enable horizontal scrolling</summary>
137 <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</description>
138 </key>
139 <key name="scroll-method" enum="com.canonical.unity.settings-daemon.GsdTouchpadScrollMethod">
140 <default>'two-finger-scrolling'</default>
141 <summary>Select the touchpad scroll method</summary>
142 <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”, “two-finger-scrolling”.</description>
143 </key>
144 <key name="tap-to-click" type="b">
145 <default>false</default>
146 <summary>Enable mouse clicks with touchpad</summary>
147 <description>Set this to TRUE to be able to send mouse clicks by tapping on the touchpad.</description>
148 </key>
149 <key name="touchpad-enabled" type="b">
150 <default>true</default>
151 <summary>Enable touchpad</summary>
152 <description>Set this to TRUE to enable all touchpads.</description>
153 </key>
154 <key name="left-handed" enum="com.canonical.unity.settings-daemon.GsdTouchpadHandedness">
155 <default>'mouse'</default>
156 <summary>Touchpad button orientation</summary>
157 <description>Swap left and right mouse buttons for left-handed mice with “left”, “right” for right-handed, “mouse” to follow the mouse setting.</description>
158 </key>
159 <key name="motion-acceleration" type="d">
160 <default>-1</default>
161 <summary>Single Click</summary>
162 <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
163 </key>
164 <key name="motion-threshold" type="i">
165 <default>-1</default>
166 <summary>Motion Threshold</summary>
167 <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
168 </key>
169 <key name="natural-scroll" type="b">
170 <default>false</default>
171 <summary>Natural scrolling</summary>
172 <description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</description>
173 </key>
174 </schema>
175 <schema id="com.canonical.unity.settings-daemon.peripherals.trackball.deprecated">
176 <key name="scroll-wheel-emulation-button" type="i">
177 <default>0</default>
178 <range min="0" max="24"/>
179 <summary>Mouse wheel emulation button. 0 to disable the feature.</summary>
180 </key>
181 </schema>
182</schemalist>
0183
=== added file 'data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,203 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.deprecated">
4 <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated"/>
5 <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated"/>
6
7 <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
8 <key name="is-absolute" type="b">
9 <default>true</default>
10 <summary>Wacom stylus absolute mode</summary>
11 <description>Enable this to set the tablet to absolute mode.</description>
12 </key>
13 <key name="area" type="ai">
14 <default>[-1, -1, -1, -1]</default>
15 <summary>Wacom tablet area</summary>
16 <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
17 </key>
18 <key name="keep-aspect" type="b">
19 <default>false</default>
20 <summary>Wacom tablet aspect ratio</summary>
21 <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
22 </key>
23 <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
24 <default>'none'</default>
25 <summary>Wacom tablet rotation</summary>
26 <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
27 </key>
28 <key name="touch" type="b">
29 <default>true</default>
30 <summary>Wacom touch feature</summary>
31 <description>Enable this to move the cursor when the user touches the tablet.</description>
32 </key>
33 </schema>
34 <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus.deprecated">
35 <key name="pressurecurve" type="ai">
36 <default>[0, 0, 100, 100]</default>
37 <summary>Wacom stylus pressure curve</summary>
38 <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
39 </key>
40 <key name="buttonmapping" type="ai">
41 <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
42 <summary>Wacom stylus button mapping</summary>
43 <description>Set this to the logical button mapping.</description>
44 </key>
45 <key name="pressurethreshold" type="i">
46 <default>-1</default>
47 <summary>Wacom stylus pressure threshold</summary>
48 <description>Set this to the pressure value at which a stylus click event is generated.</description>
49 </key>
50 </schema>
51 <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser.deprecated">
52 <key name="pressurecurve" type="ai">
53 <default>[0, 0, 100, 100]</default>
54 <summary>Wacom eraser pressure curve</summary>
55 <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
56 </key>
57 <key name="buttonmapping" type="ai">
58 <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
59 <summary>Wacom eraser button mapping</summary>
60 <description>Set this to the logical button mapping.</description>
61 </key>
62 <key name="pressurethreshold" type="i">
63 <default>-1</default>
64 <summary>Wacom eraser pressure threshold</summary>
65 <description>Set this to the pressure value at which an eraser click event is generated.</description>
66 </key>
67 </schema>
68 <schema id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button.deprecated">
69 <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
70 <default>'none'</default>
71 <summary>Wacom button action type</summary>
72 <description>The type of action triggered by the button being pressed.</description>
73 </key>
74 <key name="custom-action" type="s">
75 <default>''</default>
76 <summary>Key combination for the custom action</summary>
77 <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
78 </key>
79 <key name="custom-elevator-action" type="as">
80 <default>['', '']</default>
81 <summary>Key combinations for a touchring or touchstrip custom action</summary>
82 <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
83 </key>
84 <key name="oled-label" type="s">
85 <default>''</default>
86 <!-- Translators: This is the OLED display on an Intuos4 tablet:
87 http://eu.shop.wacom.eu/images/articles/d9abd9f2d4d88aa0649cda97a8077e2b_8.jpg -->
88 <summary>Button label for OLED display.</summary>
89 <description>Label will be rendered to OLED display belonging to the button</description>
90 </key>
91 </schema>
92 <schema id="org.gnome.desktop.peripherals.tablet.deprecated">
93 <key name="display" type="as">
94 <default>["", "", ""]</default>
95 </key>
96 </schema>
97
98 <!-- The rest of this file is used by unity-settings-daemon only -->
99 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.gsdwacom" path="/com/canonical/unity/settings-daemon/plugins/gsdwacom/">
100 <key name="priority" type="i">
101 <default>0</default>
102 <summary>Priority to use for this plugin</summary>
103 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
104 </key>
105 <key name="active" type="b">
106 <default>true</default>
107 <summary>Activation of this plugin</summary>
108 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
109 </key>
110 </schema>
111 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom">
112 <child name="stylus" schema="com.canonical.unity.settings-daemon.peripherals.wacom.stylus"/>
113 <child name="eraser" schema="com.canonical.unity.settings-daemon.peripherals.wacom.eraser"/>
114
115 <!-- is-absolute applies to all tools but PAD, CURSOR is hard-coded -->
116 <key name="is-absolute" type="b">
117 <default>true</default>
118 <summary>Wacom stylus absolute mode</summary>
119 <description>Enable this to set the tablet to absolute mode for unity-settings-daemon.</description>
120 </key>
121 <key name="area" type="ai">
122 <default>[-1, -1, -1, -1]</default>
123 <summary>Wacom tablet area</summary>
124 <description>Set this to x1, y1 and x2, y2 of the area usable by the tools.</description>
125 </key>
126 <key name="keep-aspect" type="b">
127 <default>false</default>
128 <summary>Wacom tablet aspect ratio</summary>
129 <description>Enable this to restrict the Wacom tablet area to match the aspect ratio of the output.</description>
130 </key>
131 <key name="rotation" enum="com.canonical.unity.settings-daemon.GsdWacomRotation">
132 <default>'none'</default>
133 <summary>Wacom tablet rotation</summary>
134 <description>Set this to “none”, “cw” for 90 degree clockwise, “half” for 180 degree, and “ccw” for 90 degree counterclockwise.</description>
135 </key>
136 <key name="touch" type="b">
137 <default>true</default>
138 <summary>Wacom touch feature</summary>
139 <description>Enable this to move the cursor when the user touches the tablet.</description>
140 </key>
141 <key name="tablet-pc-button" type="b">
142 <default>false</default>
143 <summary>Wacom tablet PC feature</summary>
144 <description>Enable this to only report stylus events when the tip is pressed.</description>
145 </key>
146 <key name="display" type="as">
147 <default>["", "", ""]</default>
148 <summary>Wacom display mapping</summary>
149 <description>EDID information of monitor to map tablet to. Must be in the format [vendor, product, serial]. ["","",""] disables mapping.</description>
150 </key>
151 </schema>
152 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.stylus">
153 <key name="pressurecurve" type="ai">
154 <default>[0, 0, 100, 100]</default>
155 <summary>Wacom stylus pressure curve</summary>
156 <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the stylus.</description>
157 </key>
158 <key name="buttonmapping" type="ai">
159 <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
160 <summary>Wacom stylus button mapping</summary>
161 <description>Set this to the logical button mapping.</description>
162 </key>
163 <key name="pressurethreshold" type="i">
164 <default>-1</default>
165 <summary>Wacom stylus pressure threshold</summary>
166 <description>Set this to the pressure value at which a stylus click event is generated.</description>
167 </key>
168 </schema>
169 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.eraser">
170 <key name="pressurecurve" type="ai">
171 <default>[0, 0, 100, 100]</default>
172 <summary>Wacom eraser pressure curve</summary>
173 <description>Set this to x1, y1 and x2, y2 of the pressure curve applied to the eraser.</description>
174 </key>
175 <key name="buttonmapping" type="ai">
176 <default>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]</default>
177 <summary>Wacom eraser button mapping</summary>
178 <description>Set this to the logical button mapping.</description>
179 </key>
180 <key name="pressurethreshold" type="i">
181 <default>-1</default>
182 <summary>Wacom eraser pressure threshold</summary>
183 <description>Set this to the pressure value at which an eraser click event is generated.</description>
184 </key>
185 </schema>
186 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button">
187 <key name="action-type" enum="com.canonical.unity.settings-daemon.GsdWacomActionType">
188 <default>'none'</default>
189 <summary>Wacom button action type</summary>
190 <description>The type of action triggered by the button being pressed.</description>
191 </key>
192 <key name="custom-action" type="s">
193 <default>''</default>
194 <summary>Key combination for the custom action</summary>
195 <description>The keyboard shortcut generated when the button is pressed for custom actions.</description>
196 </key>
197 <key name="custom-elevator-action" type="as">
198 <default>['', '']</default>
199 <summary>Key combinations for a touchring or touchstrip custom action</summary>
200 <description>The keyboard shortcuts generated when a touchring or touchstrip is used for custom actions (up followed by down).</description>
201 </key>
202 </schema>
203</schemalist>
0204
=== added file 'data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,55 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.color" path="/com/canonical/unity/settings-daemon/plugins/color/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 <key name="recalibrate-display-threshold" type="u">
15 <default>0</default>
16 <summary>The duration a display profile is valid</summary>
17 <description>This is the number of days after which the display color profile is considered invalid.</description>
18 </key>
19 <key name="recalibrate-printer-threshold" type="u">
20 <default>0</default>
21 <summary>The duration a printer profile is valid</summary>
22 <description>This is the number of days after which the printer color profile is considered invalid.</description>
23 </key>
24 <key name="night-light-enabled" type="b">
25 <default>false</default>
26 <summary>If the night light mode is enabled</summary>
27 <description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
28 </key>
29 <key name="night-light-temperature" type="u">
30 <default>4000</default>
31 <summary>Temperature of the display when enabled</summary>
32 <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>
33 </key>
34 <key name="night-light-schedule-automatic" type="b">
35 <default>true</default>
36 <summary>Use the sunrise and sunset</summary>
37 <description>Calculate the sunrise and sunset times automatically, from the current location.</description>
38 </key>
39 <key name="night-light-schedule-from" type="d">
40 <default>20.00</default>
41 <summary>The start time</summary>
42 <description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
43 </key>
44 <key name="night-light-schedule-to" type="d">
45 <default>6.00</default>
46 <summary>The end time</summary>
47 <description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
48 </key>
49 <key name="night-light-last-coordinates" type="(dd)">
50 <default>(91,181)</default>
51 <summary>The last detected position</summary>
52 <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>
53 </key>
54 </schema>
55</schemalist>
056
=== added file 'data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.datetime" path="/com/canonical/unity/settings-daemon/plugins/datetime/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 </schema>
15</schemalist>
016
=== added file 'data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,167 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins" path="/com/canonical/unity/settings-daemon/plugins/">
4 <key name="whitelisted-plugins" type="as">
5 <default>['all']</default>
6 <summary>List of plugins that are allowed to be loaded</summary>
7 <description>
8 A list of strings representing the plugins that are allowed to be loaded (default: “all”).
9 This is only evaluated on startup.
10 </description>
11 </key>
12 <child name="a11y-keyboard" schema="com.canonical.unity.settings-daemon.plugins.a11y-keyboard"/>
13 <child name="a11y-settings" schema="com.canonical.unity.settings-daemon.plugins.a11y-settings"/>
14 <child name="background" schema="com.canonical.unity.settings-daemon.plugins.background"/>
15 <child name="clipboard" schema="com.canonical.unity.settings-daemon.plugins.clipboard"/>
16 <child name="color" schema="com.canonical.unity.settings-daemon.plugins.color"/>
17 <child name="cursor" schema="com.canonical.unity.settings-daemon.plugins.cursor"/>
18 <child name="datetime" schema="com.canonical.unity.settings-daemon.plugins.datetime"/>
19 <child name="gsdwacom" schema="com.canonical.unity.settings-daemon.plugins.gsdwacom"/>
20 <child name="housekeeping" schema="com.canonical.unity.settings-daemon.plugins.housekeeping"/>
21 <child name="keyboard" schema="com.canonical.unity.settings-daemon.plugins.keyboard"/>
22 <child name="media-keys" schema="com.canonical.unity.settings-daemon.plugins.media-keys"/>
23 <child name="mouse" schema="com.canonical.unity.settings-daemon.plugins.mouse"/>
24 <child name="orientation" schema="com.canonical.unity.settings-daemon.plugins.orientation"/>
25 <child name="power" schema="com.canonical.unity.settings-daemon.plugins.power"/>
26 <child name="print-notifications" schema="com.canonical.unity.settings-daemon.plugins.print-notifications"/>
27 <child name="remote-display" schema="com.canonical.unity.settings-daemon.plugins.remote-display"/>
28 <child name="screensaver-proxy" schema="com.canonical.unity.settings-daemon.plugins.screensaver-proxy"/>
29 <child name="sharing" schema="com.canonical.unity.settings-daemon.plugins.sharing"/>
30 <child name="smartcard" schema="com.canonical.unity.settings-daemon.plugins.smartcard"/>
31 <child name="sound" schema="com.canonical.unity.settings-daemon.plugins.sound"/>
32 <child name="xrandr" schema="com.canonical.unity.settings-daemon.plugins.xrandr"/>
33 <child name="xsettings" schema="com.canonical.unity.settings-daemon.plugins.xsettings"/>
34 </schema>
35 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-keyboard" path="/com/canonical/unity/settings-daemon/plugins/a11y-keyboard/">
36 <key name="priority" type="i">
37 <default>0</default>
38 <summary>Priority to use for this plugin</summary>
39 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
40 </key>
41 <key name="active" type="b">
42 <default>true</default>
43 <summary>Activation of this plugin</summary>
44 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
45 </key>
46 </schema>
47 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.a11y-settings" path="/com/canonical/unity/settings-daemon/plugins/a11y-settings/">
48 <key name="priority" type="i">
49 <default>0</default>
50 <summary>Priority to use for this plugin</summary>
51 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
52 </key>
53 <key name="active" type="b">
54 <default>true</default>
55 <summary>Activation of this plugin</summary>
56 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
57 </key>
58 </schema>
59 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.background" path="/com/canonical/unity/settings-daemon/plugins/background/">
60 <key name="priority" type="i">
61 <default>0</default>
62 <summary>Priority to use for this plugin</summary>
63 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
64 </key>
65 <key name="active" type="b">
66 <default>true</default>
67 <summary>Activation of this plugin</summary>
68 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
69 </key>
70 </schema>
71 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.clipboard" path="/com/canonical/unity/settings-daemon/plugins/clipboard/">
72 <key name="priority" type="i">
73 <default>0</default>
74 <summary>Priority to use for this plugin</summary>
75 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
76 </key>
77 <key name="active" type="b">
78 <default>true</default>
79 <summary>Activation of this plugin</summary>
80 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
81 </key>
82 </schema>
83 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.cursor" path="/com/canonical/unity/settings-daemon/plugins/cursor/">
84 <key name="priority" type="i">
85 <default>0</default>
86 <summary>Priority to use for this plugin</summary>
87 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
88 </key>
89 <key name="active" type="b">
90 <default>true</default>
91 <summary>Activation of this plugin</summary>
92 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
93 </key>
94 </schema>
95 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.mouse" path="/com/canonical/unity/settings-daemon/plugins/mouse/">
96 <key name="priority" type="i">
97 <default>0</default>
98 <summary>Priority to use for this plugin</summary>
99 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
100 </key>
101 <key name="active" type="b">
102 <default>true</default>
103 <summary>Activation of this plugin</summary>
104 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
105 </key>
106 </schema>
107 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.remote-display" path="/com/canonical/unity/settings-daemon/plugins/remote-display/">
108 <key name="priority" type="i">
109 <default>0</default>
110 <summary>Priority to use for this plugin</summary>
111 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
112 </key>
113 <key name="active" type="b">
114 <default>true</default>
115 <summary>Activation of this plugin</summary>
116 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
117 </key>
118 </schema>
119 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.rfkill" path="/com/canonical/unity/settings-daemon/plugins/rfkill/">
120 <key name="priority" type="i">
121 <default>0</default>
122 <summary>Priority to use for this plugin</summary>
123 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
124 </key>
125 <key name="active" type="b">
126 <default>true</default>
127 <summary>Activation of this plugin</summary>
128 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
129 </key>
130 </schema>
131 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.screensaver-proxy" path="/com/canonical/unity/settings-daemon/plugins/screensaver-proxy/">
132 <key name="priority" type="i">
133 <default>0</default>
134 <summary>Priority to use for this plugin</summary>
135 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
136 </key>
137 <key name="active" type="b">
138 <default>true</default>
139 <summary>Activation of this plugin</summary>
140 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
141 </key>
142 </schema>
143 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.smartcard" path="/com/canonical/unity/settings-daemon/plugins/smartcard/">
144 <key name="priority" type="i">
145 <default>0</default>
146 <summary>Priority to use for this plugin</summary>
147 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
148 </key>
149 <key name="active" type="b">
150 <default>true</default>
151 <summary>Activation of this plugin</summary>
152 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
153 </key>
154 </schema>
155 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sound" path="/com/canonical/unity/settings-daemon/plugins/sound/">
156 <key name="priority" type="i">
157 <default>0</default>
158 <summary>Priority to use for this plugin</summary>
159 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
160 </key>
161 <key name="active" type="b">
162 <default>true</default>
163 <summary>Activation of this plugin</summary>
164 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
165 </key>
166 </schema>
167</schemalist>
0168
=== added file 'data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,42 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.housekeeping" path="/com/canonical/unity/settings-daemon/plugins/housekeeping/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 <key name="ignore-paths" type="as">
15 <default>[]</default>
16 <summary>Mount paths to ignore</summary>
17 <description>Specify a list of mount paths to ignore when they run low on space.</description>
18 </key>
19 <key name="free-percent-notify" type="d">
20 <default>0.05</default>
21 <range min="0.0" max="1.0"/>
22 <summary>Free percentage notify threshold</summary>
23 <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>
24 </key>
25 <key name="free-percent-notify-again" type="d">
26 <default>0.01</default>
27 <range min="0.0" max="1.0"/>
28 <summary>Subsequent free space percentage notify threshold</summary>
29 <description>Specify the percentage that the free disk space should reduce by before issuing a subsequent warning.</description>
30 </key>
31 <key name="free-size-gb-no-notify" type="i">
32 <default>1</default>
33 <summary>Free space notify threshold</summary>
34 <description>Specify an amount in GB. If the amount of free space is more than this, no warning will be shown.</description>
35 </key>
36 <key name="min-notify-period" type="i">
37 <default>10</default>
38 <summary>Minimum notify period for repeated warnings</summary>
39 <description>Specify a time in minutes. Subsequent warnings for a volume will not appear more often than this period.</description>
40 </key>
41 </schema>
42</schemalist>
043
=== added file 'data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.keyboard" path="/com/canonical/unity/settings-daemon/plugins/keyboard/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 </schema>
15</schemalist>
016
=== added file 'data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.orientation" path="/com/canonical/unity/settings-daemon/plugins/orientation/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 </schema>
15</schemalist>
016
=== added file 'data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,144 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.power" path="/com/canonical/unity/settings-daemon/plugins/power/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 <key name="idle-brightness" type="i">
15 <default>30</default>
16 <summary>The brightness of the screen when idle</summary>
17 <description>This is the laptop panel screen brightness used when the session is idle.</description>
18 </key>
19 <key name="idle-dim" type="b">
20 <default>true</default>
21 <summary>Dim the screen after a period of inactivity</summary>
22 <description>If the screen should be dimmed to save power when the computer is idle.</description>
23 </key>
24 <key name="sleep-inactive-ac-timeout" type="i">
25 <default>1200</default>
26 <summary>Sleep timeout computer when on AC</summary>
27 <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>
28 </key>
29 <key name="sleep-inactive-ac-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
30 <default>'suspend'</default>
31 <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
32 <description>The type of sleeping that should be performed when the computer is inactive.</description>
33 </key>
34 <key name="sleep-inactive-battery-timeout" type="i">
35 <default>1200</default>
36 <summary>Sleep timeout computer when on battery</summary>
37 <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>
38 </key>
39 <key name="sleep-inactive-battery-type" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
40 <default>'suspend'</default>
41 <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
42 <description>The type of sleeping that should be performed when the computer is inactive.</description>
43 </key>
44 <!-- See http://bugzilla.gnome.org/637473 for rationale -->
45 <key name="lid-close-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
46 <default>'suspend'</default>
47 <summary>Laptop lid close action on battery</summary>
48 <description>The action to take when the laptop lid is closed and the laptop is on battery power.</description>
49 </key>
50 <key name="lid-close-ac-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
51 <default>'suspend'</default>
52 <summary>Laptop lid close action when on AC</summary>
53 <description>The action to take when the laptop lid is closed and the laptop is on AC power.</description>
54 </key>
55 <key name="lid-close-suspend-with-external-monitor" type="b">
56 <default>false</default>
57 <summary>Laptop lid, when closed, will suspend even if there is an external monitor plugged in</summary>
58 <description>With no external monitors plugged in, closing a laptop's lid
59 will suspend the machine (as set by the lid-close-battery-action and
60 lid-close-ac-action keys). By default, however, closing the lid when
61 an external monitor is present will not suspend the machine, so that one can keep
62 working on that monitor (e.g. for docking stations or media viewers). Set this
63 key to False to keep the default behavior, or to True to suspend the laptop whenever the
64 lid is closed and regardless of external monitors.</description>
65 </key>
66 <key name="ambient-enabled" type="b">
67 <default>true</default>
68 <summary>Enable the ALS sensor</summary>
69 <description>If the ambient light sensor functionality is enabled.</description>
70 </key>
71 <key name="power-button-action" enum="com.canonical.unity.settings-daemon.GsdPowerButtonActionType">
72 <default>'suspend'</default>
73 <summary>Power button action</summary>
74 <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>
75 </key>
76 <!-- Obsolete keys still used by unity-settings-daemon -->
77 <key name="button-suspend" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
78 <default>'suspend'</default>
79 <summary>Suspend button action</summary>
80 <description>The action to take when the system suspend button is pressed.</description>
81 </key>
82 <key name="button-hibernate" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
83 <default>'hibernate'</default>
84 <summary>Hibernate button action</summary>
85 <description>The action to take when the system hibernate button is pressed.</description>
86 </key>
87 <key name="button-sleep" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
88 <default>'hibernate'</default>
89 <summary>Sleep button action</summary>
90 <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
91 </key>
92 <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
93 <key name="button-power" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
94 <default>'suspend'</default>
95 <summary>Power button action</summary>
96 <description>The action to take when the system power button is pressed.</description>
97 </key>
98 <key name="critical-battery-action" enum="com.canonical.unity.settings-daemon.GsdPowerActionType">
99 <default>'hibernate'</default>
100 <summary>Battery critical low action</summary>
101 <description>The action to take when the battery is critically low.</description>
102 </key>
103 <key name="percentage-low" type="i">
104 <default>10</default>
105 <summary>Percentage considered low</summary>
106 <description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</description>
107 </key>
108 <key name="percentage-critical" type="i">
109 <default>3</default>
110 <summary>Percentage considered critical</summary>
111 <description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</description>
112 </key>
113 <key name="percentage-action" type="i">
114 <default>2</default>
115 <summary>Percentage action is taken</summary>
116 <description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</description>
117 </key>
118 <key name="time-low" type="i">
119 <default>1200</default>
120 <summary>The time remaining when low</summary>
121 <description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</description>
122 </key>
123 <key name="time-critical" type="i">
124 <default>300</default>
125 <summary>The time remaining when critical</summary>
126 <description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</description>
127 </key>
128 <key name="time-action" type="i">
129 <default>120</default>
130 <summary>The time remaining when action is taken</summary>
131 <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
132 </key>
133 <key name="use-time-for-policy" type="b">
134 <default>true</default>
135 <summary>Whether to use time-based notifications</summary>
136 <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>
137 </key>
138 <key name="notify-perhaps-recall" type="b">
139 <default>true</default>
140 <summary>If we should show the recalled battery warning for a broken battery</summary>
141 <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>
142 </key>
143 </schema>
144</schemalist>
0145
=== added file 'data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.print-notifications" path="/com/canonical/unity/settings-daemon/plugins/print-notifications/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 </schema>
15</schemalist>
016
=== added file 'data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,22 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing" path="/com/canonical/unity/settings-daemon/plugins/sharing/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 </schema>
15 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.sharing.service">
16 <key name="enabled-connections" type="as">
17 <default>[]</default>
18 <summary>On which connections the service is enabled</summary>
19 <description>The list of NetworkManager connections (each one represented with its UUID) on which this service is enabled and started.</description>
20 </key>
21 </schema>
22</schemalist>
023
=== added file 'data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,25 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xrandr" path="/com/canonical/unity/settings-daemon/plugins/xrandr/">
4 <key name="default-configuration-file" type="s">
5 <default>'/etc/gnome-settings-daemon/xrandr/monitors.xml'</default>
6 <summary>File for default configuration for RandR</summary>
7 <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>
8 </key>
9 <key name="default-monitors-setup" enum="com.canonical.unity.settings-daemon.GsdXrandrBootBehaviour">
10 <default>'follow-lid'</default>
11 <summary>Whether to turn off specific monitors after boot</summary>
12 <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>
13 </key>
14 <key name="priority" type="i">
15 <default>0</default>
16 <summary>Priority to use for this plugin</summary>
17 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
18 </key>
19 <key name="active" type="b">
20 <default>true</default>
21 <summary>Activation of this plugin</summary>
22 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
23 </key>
24 </schema>
25</schemalist>
026
=== added file 'data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in 2020-03-06 20:26:03 +0000
@@ -0,0 +1,45 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.xsettings" path="/com/canonical/unity/settings-daemon/plugins/xsettings/">
4 <key name="priority" type="i">
5 <default>0</default>
6 <summary>Priority to use for this plugin</summary>
7 <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
8 </key>
9 <key name="active" type="b">
10 <default>true</default>
11 <summary>Activation of this plugin</summary>
12 <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
13 </key>
14 <key name="antialiasing" enum="com.canonical.unity.settings-daemon.GsdFontAntialiasingMode">
15 <default>'grayscale'</default>
16 <summary>Antialiasing</summary>
17 <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>
18 </key>
19 <key name="hinting" enum="com.canonical.unity.settings-daemon.GsdFontHinting">
20 <default>'slight'</default>
21 <summary>Hinting</summary>
22 <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>
23 </key>
24 <key name="rgba-order" enum="com.canonical.unity.settings-daemon.GsdFontRgbaOrder">
25 <default>'rgb'</default>
26 <summary>RGBA order</summary>
27 <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>
28 </key>
29 <key name="disabled-gtk-modules" type="as">
30 <default>[]</default>
31 <summary>List of explicitly disabled GTK+ modules</summary>
32 <description>A list of strings representing the GTK+ modules that will not be loaded, even if enabled by default in their configuration.</description>
33 </key>
34 <key name="enabled-gtk-modules" type="as">
35 <default>[]</default>
36 <summary>List of explicitly enabled GTK+ modules</summary>
37 <description>A list of strings representing the GTK+ modules that will be loaded, usually in addition to conditional and forcibly disabled ones.</description>
38 </key>
39 <key type="a{sv}" name="overrides">
40 <default>{}</default>
41 <summary>A dictionary of XSETTINGS to override</summary>
42 <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>
43 </key>
44 </schema>
45</schemalist>
046
=== modified file 'data/gnome-settings-daemon.convert'
--- data/gnome-settings-daemon.convert 2013-11-13 01:49:28 +0000
+++ data/gnome-settings-daemon.convert 2020-03-06 20:26:03 +0000
@@ -1,7 +1,7 @@
1[org.gnome.settings-daemon.peripherals.smartcard]1[com.canonical.unity.settings-daemon.peripherals.smartcard]
2removal-action = /desktop/gnome/peripherals/smartcard/removal_action2removal-action = /desktop/gnome/peripherals/smartcard/removal_action
33
4[org.gnome.settings-daemon.peripherals.touchpad]4[com.canonical.unity.settings-daemon.peripherals.touchpad]
5disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing5disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing
6horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled6horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled
7scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method7scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method
@@ -10,23 +10,23 @@
10motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration10motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
11motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold11motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
1212
13[org.gnome.settings-daemon.plugins.a11y-keyboard]13[com.canonical.unity.settings-daemon.plugins.a11y-keyboard]
14active = /apps/gnome_settings_daemon/plugins/a11y-keyboard/active14active = /apps/gnome_settings_daemon/plugins/a11y-keyboard/active
15priority = /apps/gnome_settings_daemon/plugins/a11y-keyboard/priority15priority = /apps/gnome_settings_daemon/plugins/a11y-keyboard/priority
1616
17[org.gnome.settings-daemon.plugins.background]17[com.canonical.unity.settings-daemon.plugins.background]
18active = /apps/gnome_settings_daemon/plugins/background/active18active = /apps/gnome_settings_daemon/plugins/background/active
19priority = /apps/gnome_settings_daemon/plugins/background/priority19priority = /apps/gnome_settings_daemon/plugins/background/priority
2020
21[org.gnome.settings-daemon.plugins.clipboard]21[com.canonical.unity.settings-daemon.plugins.clipboard]
22active = /apps/gnome_settings_daemon/plugins/clipboard/active22active = /apps/gnome_settings_daemon/plugins/clipboard/active
23priority = /apps/gnome_settings_daemon/plugins/clipboard/priority23priority = /apps/gnome_settings_daemon/plugins/clipboard/priority
2424
25[org.gnome.settings-daemon.plugins.font]25[com.canonical.unity.settings-daemon.plugins.font]
26active = /apps/gnome_settings_daemon/plugins/font/active26active = /apps/gnome_settings_daemon/plugins/font/active
27priority = /apps/gnome_settings_daemon/plugins/font/priority27priority = /apps/gnome_settings_daemon/plugins/font/priority
2828
29[org.gnome.settings-daemon.plugins.housekeeping]29[com.canonical.unity.settings-daemon.plugins.housekeeping]
30active = /apps/gnome_settings_daemon/plugins/housekeeping/active30active = /apps/gnome_settings_daemon/plugins/housekeeping/active
31free-percent-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify31free-percent-notify = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify
32free-percent-notify-again = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again32free-percent-notify-again = /apps/gnome_settings_daemon/plugins/housekeeping/free_percent_notify_again
@@ -35,11 +35,11 @@
35min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_period35min-notify-period = /apps/gnome_settings_daemon/plugins/housekeeping/min_notify_period
36priority = /apps/gnome_settings_daemon/plugins/housekeeping/priority36priority = /apps/gnome_settings_daemon/plugins/housekeeping/priority
3737
38[org.gnome.settings-daemon.plugins.keyboard]38[com.canonical.unity.settings-daemon.plugins.keyboard]
39active = /apps/gnome_settings_daemon/plugins/keyboard/active39active = /apps/gnome_settings_daemon/plugins/keyboard/active
40priority = /apps/gnome_settings_daemon/plugins/keyboard/priority40priority = /apps/gnome_settings_daemon/plugins/keyboard/priority
4141
42[org.gnome.settings-daemon.plugins.media-keys]42[com.canonical.unity.settings-daemon.plugins.media-keys]
43active = /apps/gnome_settings_daemon/plugins/keybindings/active43active = /apps/gnome_settings_daemon/plugins/keybindings/active
44calculator = /apps/gnome_settings_daemon/keybindings/calculator44calculator = /apps/gnome_settings_daemon/keybindings/calculator
45email = /apps/gnome_settings_daemon/keybindings/email45email = /apps/gnome_settings_daemon/keybindings/email
@@ -65,11 +65,11 @@
65window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot65window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
66terminal = /apps/metacity/global_keybindings/run_command_terminal66terminal = /apps/metacity/global_keybindings/run_command_terminal
6767
68[org.gnome.settings-daemon.plugins.mouse]68[com.canonical.unity.settings-daemon.plugins.mouse]
69active = /apps/gnome_settings_daemon/plugins/mouse/active69active = /apps/gnome_settings_daemon/plugins/mouse/active
70priority = /apps/gnome_settings_daemon/plugins/mouse/priority70priority = /apps/gnome_settings_daemon/plugins/mouse/priority
7171
72[org.gnome.settings-daemon.peripherals.mouse]72[com.canonical.unity.settings-daemon.peripherals.mouse]
73locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer73locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
74double-click = /desktop/gnome/peripherals/mouse/double_click74double-click = /desktop/gnome/peripherals/mouse/double_click
75drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold75drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
@@ -77,20 +77,20 @@
77motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration77motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
78motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold78motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
7979
80[org.gnome.settings-daemon.plugins.smartcard]80[com.canonical.unity.settings-daemon.plugins.smartcard]
81active = /apps/gnome_settings_daemon/plugins/smartcard/active81active = /apps/gnome_settings_daemon/plugins/smartcard/active
82priority = /apps/gnome_settings_daemon/plugins/smartcard/priority82priority = /apps/gnome_settings_daemon/plugins/smartcard/priority
8383
84[org.gnome.settings-daemon.plugins.sound]84[com.canonical.unity.settings-daemon.plugins.sound]
85active = /apps/gnome_settings_daemon/plugins/sound/active85active = /apps/gnome_settings_daemon/plugins/sound/active
86priority = /apps/gnome_settings_daemon/plugins/sound/priority86priority = /apps/gnome_settings_daemon/plugins/sound/priority
8787
88[org.gnome.settings-daemon.plugins.xrandr]88[com.canonical.unity.settings-daemon.plugins.xrandr]
89active = /apps/gnome_settings_daemon/plugins/xrandr/active89active = /apps/gnome_settings_daemon/plugins/xrandr/active
90default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file90default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
91priority = /apps/gnome_settings_daemon/plugins/xrandr/priority91priority = /apps/gnome_settings_daemon/plugins/xrandr/priority
9292
93[org.gnome.settings-daemon.plugins.xsettings]93[com.canonical.unity.settings-daemon.plugins.xsettings]
94active = /apps/gnome_settings_daemon/plugins/xsettings/active94active = /apps/gnome_settings_daemon/plugins/xsettings/active
95antialiasing = /desktop/gnome/font_rendering/antialiasing95antialiasing = /desktop/gnome/font_rendering/antialiasing
96hinting = /desktop/gnome/font_rendering/hinting96hinting = /desktop/gnome/font_rendering/hinting
9797
=== modified file 'data/gsd-enums.h'
--- data/gsd-enums.h 2013-01-25 15:43:27 +0000
+++ data/gsd-enums.h 2020-03-06 20:26:03 +0000
@@ -112,6 +112,14 @@
112112
113typedef enum113typedef enum
114{114{
115 GSD_POWER_BUTTON_ACTION_NOTHING,
116 GSD_POWER_BUTTON_ACTION_SUSPEND,
117 GSD_POWER_BUTTON_ACTION_HIBERNATE,
118 GSD_POWER_BUTTON_ACTION_INTERACTIVE
119} GsdPowerButtonActionType;
120
121typedef enum
122{
115 GSD_UPDATE_TYPE_ALL,123 GSD_UPDATE_TYPE_ALL,
116 GSD_UPDATE_TYPE_SECURITY,124 GSD_UPDATE_TYPE_SECURITY,
117 GSD_UPDATE_TYPE_NONE125 GSD_UPDATE_TYPE_NONE
118126
=== modified file 'debian/control'
--- debian/control 2020-02-23 15:03:25 +0000
+++ debian/control 2020-03-06 20:26:03 +0000
@@ -60,7 +60,6 @@
60 gsettings-desktop-schemas (>= 3.15.4),60 gsettings-desktop-schemas (>= 3.15.4),
61 nautilus-data (>= 2.91.3-1),61 nautilus-data (>= 2.91.3-1),
62 unity-settings-daemon-schemas (>= ${source:Version}),62 unity-settings-daemon-schemas (>= ${source:Version}),
63 gnome-settings-daemon-common (>= 3.16),
64 gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),63 gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
65Recommends: ibus (>= 1.5.0),64Recommends: ibus (>= 1.5.0),
66 pulseaudio,65 pulseaudio,
6766
=== modified file 'gnome-settings-daemon/gnome-settings-manager.c'
--- gnome-settings-daemon/gnome-settings-manager.c 2016-06-02 07:50:58 +0000
+++ gnome-settings-daemon/gnome-settings-manager.c 2020-03-06 20:26:03 +0000
@@ -36,7 +36,7 @@
36#include "gnome-settings-profile.h"36#include "gnome-settings-profile.h"
37#include "gsd-pnp-ids.h"37#include "gsd-pnp-ids.h"
3838
39#define DEFAULT_SETTINGS_PREFIX "org.gnome.settings-daemon"39#define DEFAULT_SETTINGS_PREFIX "com.canonical.unity.settings-daemon"
4040
41#define PLUGIN_EXT ".gnome-settings-plugin"41#define PLUGIN_EXT ".gnome-settings-plugin"
4242
4343
=== modified file 'gnome-settings-daemon/main.c'
--- gnome-settings-daemon/main.c 2016-05-20 16:50:05 +0000
+++ gnome-settings-daemon/main.c 2020-03-06 20:26:03 +0000
@@ -264,7 +264,7 @@
264 GSettings *settings;264 GSettings *settings;
265 gboolean enabled;265 gboolean enabled;
266266
267 settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard");267 settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.keyboard");
268 enabled = g_settings_get_boolean (settings, "active");268 enabled = g_settings_get_boolean (settings, "active");
269 g_object_unref (settings);269 g_object_unref (settings);
270270
271271
=== modified file 'plugins/color/gsd-color-manager.c'
--- plugins/color/gsd-color-manager.c 2016-05-20 21:20:36 +0000
+++ plugins/color/gsd-color-manager.c 2020-03-06 20:26:03 +0000
@@ -2164,7 +2164,7 @@
2164 /* use DMI data for internal panels */2164 /* use DMI data for internal panels */
2165 priv->dmi = gcm_dmi_new ();2165 priv->dmi = gcm_dmi_new ();
21662166
2167 priv->settings = g_settings_new ("org.gnome.settings-daemon.plugins.color");2167 priv->settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.color");
2168 priv->client = cd_client_new ();2168 priv->client = cd_client_new ();
2169 g_signal_connect (priv->client, "device-added",2169 g_signal_connect (priv->client, "device-added",
2170 G_CALLBACK (gcm_session_device_added_notify_cb),2170 G_CALLBACK (gcm_session_device_added_notify_cb),
21712171
=== modified file 'plugins/common/gsd-input-helper.c'
--- plugins/common/gsd-input-helper.c 2016-05-24 15:03:22 +0000
+++ plugins/common/gsd-input-helper.c 2020-03-06 20:26:03 +0000
@@ -31,7 +31,7 @@
3131
32#include "gsd-input-helper.h"32#include "gsd-input-helper.h"
3333
34#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"34#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.peripherals.input-devices"
35#define KEY_HOTPLUG_COMMAND "hotplug-command"35#define KEY_HOTPLUG_COMMAND "hotplug-command"
3636
37#define ABS_MT_X "Abs MT Position X"37#define ABS_MT_X "Abs MT Position X"
3838
=== modified file 'plugins/common/input-device-example.sh'
--- plugins/common/input-device-example.sh 2012-10-09 09:08:27 +0000
+++ plugins/common/input-device-example.sh 2020-03-06 20:26:03 +0000
@@ -16,7 +16,7 @@
16# ignored from future configuration.16# ignored from future configuration.
17#17#
18# Set the script to be used with:18# Set the script to be used with:
19# gsettings set org.gnome.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh19# gsettings set com.canonical.unity.settings-daemon.peripherals.input-devices hotplug-command /path/to/script/input-devices.sh
20#20#
2121
22args=`getopt "t:i:" $*`22args=`getopt "t:i:" $*`
2323
=== modified file 'plugins/common/test-plugin.h'
--- plugins/common/test-plugin.h 2012-12-17 11:21:23 +0000
+++ plugins/common/test-plugin.h 2020-03-06 20:26:03 +0000
@@ -35,7 +35,7 @@
3535
36 list = g_settings_list_schemas ();36 list = g_settings_list_schemas ();
37 for (i = 0; list[i] != NULL; i++) {37 for (i = 0; list[i] != NULL; i++) {
38 if (g_str_equal (list[i], "org.gnome.settings-daemon.plugins." SCHEMA_NAME))38 if (g_str_equal (list[i], "com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME))
39 return TRUE;39 return TRUE;
40 }40 }
41 return FALSE;41 return FALSE;
@@ -45,9 +45,9 @@
45print_enable_disable_help (void)45print_enable_disable_help (void)
46{46{
47 fprintf (stderr, "To deactivate:\n");47 fprintf (stderr, "To deactivate:\n");
48 fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active false\n");48 fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active false\n");
49 fprintf (stderr, "To reactivate:\n");49 fprintf (stderr, "To reactivate:\n");
50 fprintf (stderr, "\tgsettings set org.gnome.settings-daemon.plugins." SCHEMA_NAME " active true\n");50 fprintf (stderr, "\tgsettings set com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME " active true\n");
51}51}
5252
53int53int
@@ -73,7 +73,7 @@
73 if (has_settings () == FALSE) {73 if (has_settings () == FALSE) {
74 fprintf (stderr, "The schemas for plugin '%s' isn't available, check your installation.\n", SCHEMA_NAME);74 fprintf (stderr, "The schemas for plugin '%s' isn't available, check your installation.\n", SCHEMA_NAME);
75 } else {75 } else {
76 settings = g_settings_new ("org.gnome.settings-daemon.plugins." SCHEMA_NAME);76 settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins." SCHEMA_NAME);
77 if (g_settings_get_boolean (settings, "active") != FALSE) {77 if (g_settings_get_boolean (settings, "active") != FALSE) {
78 fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);78 fprintf (stderr, "Plugin '%s' is not disabled. You need to disable it before launching the test application.\n", SCHEMA_NAME);
79 print_enable_disable_help ();79 print_enable_disable_help ();
8080
=== modified file 'plugins/housekeeping/gsd-disk-space.c'
--- plugins/housekeeping/gsd-disk-space.c 2015-10-07 17:07:26 +0000
+++ plugins/housekeeping/gsd-disk-space.c 2020-03-06 20:26:03 +0000
@@ -45,7 +45,7 @@
4545
46#define DISK_SPACE_ANALYZER "baobab"46#define DISK_SPACE_ANALYZER "baobab"
4747
48#define SETTINGS_HOUSEKEEPING_DIR "org.gnome.settings-daemon.plugins.housekeeping"48#define SETTINGS_HOUSEKEEPING_DIR "com.canonical.unity.settings-daemon.plugins.housekeeping"
49#define SETTINGS_FREE_PC_NOTIFY_KEY "free-percent-notify"49#define SETTINGS_FREE_PC_NOTIFY_KEY "free-percent-notify"
50#define SETTINGS_FREE_PC_NOTIFY_AGAIN_KEY "free-percent-notify-again"50#define SETTINGS_FREE_PC_NOTIFY_AGAIN_KEY "free-percent-notify-again"
51#define SETTINGS_FREE_SIZE_NO_NOTIFY "free-size-gb-no-notify"51#define SETTINGS_FREE_SIZE_NO_NOTIFY "free-size-gb-no-notify"
5252
=== modified file 'plugins/housekeeping/gsd-ldsm-dialog.c'
--- plugins/housekeeping/gsd-ldsm-dialog.c 2015-02-05 11:01:43 +0000
+++ plugins/housekeeping/gsd-ldsm-dialog.c 2020-03-06 20:26:03 +0000
@@ -24,7 +24,7 @@
2424
25#include "gsd-ldsm-dialog.h"25#include "gsd-ldsm-dialog.h"
2626
27#define SETTINGS_HOUSEKEEPING_DIR "org.gnome.settings-daemon.plugins.housekeeping"27#define SETTINGS_HOUSEKEEPING_DIR "com.canonical.unity.settings-daemon.plugins.housekeeping"
2828
29enum29enum
30{30{
3131
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c 2019-09-01 15:22:44 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c 2020-03-06 20:26:03 +0000
@@ -69,7 +69,7 @@
6969
70#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))70#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
7171
72#define GSD_KEYBOARD_DIR "org.gnome.settings-daemon.peripherals.keyboard"72#define GSD_KEYBOARD_DIR "com.canonical.unity.settings-daemon.peripherals.keyboard"
73#define GSETTINGS_KEYBOARD_SCHEMA "org.gnome.desktop.peripherals.keyboard"73#define GSETTINGS_KEYBOARD_SCHEMA "org.gnome.desktop.peripherals.keyboard"
7474
75#define KEY_REPEAT "repeat"75#define KEY_REPEAT "repeat"
@@ -685,7 +685,7 @@
685 g_debug ("New num-lock state '%s' != Old num-lock state '%s'",685 g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
686 num_lock_state_to_string (numlock_state),686 num_lock_state_to_string (numlock_state),
687 num_lock_state_to_string (manager->priv->old_state));687 num_lock_state_to_string (manager->priv->old_state));
688 g_settings_set_enum (manager->priv->gsettings,688 g_settings_set_enum (manager->priv->settings,
689 KEY_NUMLOCK_STATE,689 KEY_NUMLOCK_STATE,
690 numlock_state);690 numlock_state);
691 manager->priv->old_state = numlock_state;691 manager->priv->old_state = numlock_state;
@@ -1793,9 +1793,9 @@
1793 gboolean rnumlock;1793 gboolean rnumlock;
17941794
1795 g_debug ("Applying the num-lock settings");1795 g_debug ("Applying the num-lock settings");
1796 settings = manager->priv->gsettings;1796 settings = manager->priv->settings;
1797 rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE);1797 rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE);
1798 manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE);1798 manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
17991799
1800 gdk_error_trap_push ();1800 gdk_error_trap_push ();
1801 if (rnumlock) {1801 if (rnumlock) {
@@ -2629,12 +2629,11 @@
2629 GsdSettingsMigrateEntry entries[] = {2629 GsdSettingsMigrateEntry entries[] = {
2630 { "repeat", "repeat", NULL },2630 { "repeat", "repeat", NULL },
2631 { "repeat-interval", "repeat-interval", NULL },2631 { "repeat-interval", "repeat-interval", NULL },
2632 { "delay", "delay", NULL },2632 { "delay", "delay", NULL }
2633 { "remember-numlock-state", "remember-numlock-state", NULL },
2634 };2633 };
26352634
2636 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",2635 gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.keyboard.deprecated",
2637 "/org/gnome/settings-daemon/peripherals/keyboard/",2636 "/com/canonical/unity/settings-daemon/peripherals/keyboard/",
2638 "org.gnome.desktop.peripherals.keyboard",2637 "org.gnome.desktop.peripherals.keyboard",
2639 "/org/gnome/desktop/peripherals/keyboard/",2638 "/org/gnome/desktop/peripherals/keyboard/",
2640 entries, G_N_ELEMENTS (entries));2639 entries, G_N_ELEMENTS (entries));
26412640
=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c 2018-11-30 10:40:30 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c 2020-03-06 20:26:03 +0000
@@ -110,8 +110,8 @@
110"</node>";110"</node>";
111111
112#define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface"112#define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface"
113#define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"113#define SETTINGS_POWER_DIR "com.canonical.unity.settings-daemon.plugins.power"
114#define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"114#define SETTINGS_XSETTINGS_DIR "com.canonical.unity.settings-daemon.plugins.xsettings"
115#define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"115#define SETTINGS_TOUCHPAD_DIR "org.gnome.desktop.peripherals.touchpad"
116#define UNITY_SETTINGS_INTERFACE_DIR "com.canonical.Unity.Interface"116#define UNITY_SETTINGS_INTERFACE_DIR "com.canonical.Unity.Interface"
117117
118118
=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c 2019-09-01 15:22:44 +0000
+++ plugins/mouse/gsd-mouse-manager.c 2020-03-06 20:26:03 +0000
@@ -1401,18 +1401,18 @@
1401 { "natural-scroll", "natural-scroll", NULL }1401 { "natural-scroll", "natural-scroll", NULL }
1402 };1402 };
14031403
1404 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.trackball.deprecated",1404 gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.trackball.deprecated",
1405 "/org/gnome/settings-daemon/peripherals/trackball/",1405 "/com/canonical/unity/settings-daemon/peripherals/trackball/",
1406 "org.gnome.desktop.peripherals.trackball",1406 "org.gnome.desktop.peripherals.trackball",
1407 "/org/gnome/desktop/peripherals/trackball/",1407 "/org/gnome/desktop/peripherals/trackball/",
1408 trackball_entries, G_N_ELEMENTS (trackball_entries));1408 trackball_entries, G_N_ELEMENTS (trackball_entries));
1409 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.mouse.deprecated",1409 gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.mouse.deprecated",
1410 "/org/gnome/settings-daemon/peripherals/mouse/",1410 "/com/canonical/unity/settings-daemon/peripherals/mouse/",
1411 "org.gnome.desktop.peripherals.mouse",1411 "org.gnome.desktop.peripherals.mouse",
1412 "/org/gnome/desktop/peripherals/mouse/",1412 "/org/gnome/desktop/peripherals/mouse/",
1413 mouse_entries, G_N_ELEMENTS (mouse_entries));1413 mouse_entries, G_N_ELEMENTS (mouse_entries));
1414 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.touchpad.deprecated",1414 gsd_settings_migrate_check ("com.canonical.unity.settings-daemon.peripherals.touchpad.deprecated",
1415 "/org/gnome/settings-daemon/peripherals/touchpad/",1415 "/com/canonical/unity/settings-daemon/peripherals/touchpad/",
1416 "org.gnome.desktop.peripherals.touchpad",1416 "org.gnome.desktop.peripherals.touchpad",
1417 "/org/gnome/desktop/peripherals/touchpad/",1417 "/org/gnome/desktop/peripherals/touchpad/",
1418 touchpad_entries, G_N_ELEMENTS (touchpad_entries));1418 touchpad_entries, G_N_ELEMENTS (touchpad_entries));
14191419
=== modified file 'plugins/orientation/gsd-orientation-manager.c'
--- plugins/orientation/gsd-orientation-manager.c 2015-10-07 16:12:45 +0000
+++ plugins/orientation/gsd-orientation-manager.c 2020-03-06 20:26:03 +0000
@@ -67,7 +67,7 @@
67 gboolean orientation_lock;67 gboolean orientation_lock;
68};68};
6969
70#define CONF_SCHEMA "org.gnome.settings-daemon.peripherals.touchscreen"70#define CONF_SCHEMA "com.canonical.unity.settings-daemon.peripherals.touchscreen"
71#define ORIENTATION_LOCK_KEY "orientation-lock"71#define ORIENTATION_LOCK_KEY "orientation-lock"
7272
73#define GSD_ORIENTATION_DBUS_NAME GSD_DBUS_NAME ".Orientation"73#define GSD_ORIENTATION_DBUS_NAME GSD_DBUS_NAME ".Orientation"
7474
=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c 2019-06-23 08:50:48 +0000
+++ plugins/power/gsd-power-manager.c 2020-03-06 20:26:03 +0000
@@ -59,8 +59,8 @@
59#define UPOWER_DBUS_INTERFACE "org.freedesktop.UPower"59#define UPOWER_DBUS_INTERFACE "org.freedesktop.UPower"
60#define UPOWER_DBUS_INTERFACE_KBDBACKLIGHT "org.freedesktop.UPower.KbdBacklight"60#define UPOWER_DBUS_INTERFACE_KBDBACKLIGHT "org.freedesktop.UPower.KbdBacklight"
6161
62#define GSD_POWER_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.power"62#define GSD_POWER_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.power"
63#define GSD_XRANDR_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"63#define GSD_XRANDR_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.xrandr"
6464
65#define GSD_POWER_DBUS_NAME GSD_DBUS_NAME ".Power"65#define GSD_POWER_DBUS_NAME GSD_DBUS_NAME ".Power"
66#define GSD_POWER_DBUS_PATH GSD_DBUS_PATH "/Power"66#define GSD_POWER_DBUS_PATH GSD_DBUS_PATH "/Power"
6767
=== modified file 'plugins/power/test.py'
--- plugins/power/test.py 2013-12-04 23:55:26 +0000
+++ plugins/power/test.py 2020-03-06 20:26:03 +0000
@@ -76,7 +76,7 @@
76 self.settings_screensaver = Gio.Settings('org.gnome.desktop.screensaver')76 self.settings_screensaver = Gio.Settings('org.gnome.desktop.screensaver')
77 self.settings_screensaver['lock-enabled'] = False77 self.settings_screensaver['lock-enabled'] = False
7878
79 self.settings_gsd_power = Gio.Settings('org.gnome.settings-daemon.plugins.power')79 self.settings_gsd_power = Gio.Settings('com.canonical.unity.settings-daemon.plugins.power')
8080
81 # start power plugin81 # start power plugin
82 self.settings_gsd_power['active'] = False82 self.settings_gsd_power['active'] = False
8383
=== modified file 'plugins/sharing/gsd-sharing-manager.c'
--- plugins/sharing/gsd-sharing-manager.c 2018-02-21 21:19:43 +0000
+++ plugins/sharing/gsd-sharing-manager.c 2020-03-06 20:26:03 +0000
@@ -780,8 +780,8 @@
780780
781 service = g_new0 (ServiceInfo, 1);781 service = g_new0 (ServiceInfo, 1);
782 service->name = services[i];782 service->name = services[i];
783 path = g_strdup_printf ("/org/gnome/settings-daemon/plugins/sharing/%s/", services[i]);783 path = g_strdup_printf ("/com/canonical/unity/settings-daemon/plugins/sharing/%s/", services[i]);
784 service->settings = g_settings_new_with_path ("org.gnome.settings-daemon.plugins.sharing.service", path);784 service->settings = g_settings_new_with_path ("com.canonical.unity.settings-daemon.plugins.sharing.service", path);
785 g_free (path);785 g_free (path);
786786
787 g_hash_table_insert (manager->priv->services, (gpointer) services[i], service);787 g_hash_table_insert (manager->priv->services, (gpointer) services[i], service);
788788
=== modified file 'plugins/smartcard/gsd-smartcard-plugin.c'
--- plugins/smartcard/gsd-smartcard-plugin.c 2016-05-20 21:21:08 +0000
+++ plugins/smartcard/gsd-smartcard-plugin.c 2020-03-06 20:26:03 +0000
@@ -163,7 +163,7 @@
163 char *remove_action_string;163 char *remove_action_string;
164 GsdSmartcardRemoveAction remove_action;164 GsdSmartcardRemoveAction remove_action;
165165
166 settings = g_settings_new ("org.gnome.settings-daemon.peripherals.smartcard");166 settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.smartcard");
167 remove_action_string = g_settings_get_string (settings, KEY_REMOVE_ACTION);167 remove_action_string = g_settings_get_string (settings, KEY_REMOVE_ACTION);
168168
169 if (remove_action_string == NULL) {169 if (remove_action_string == NULL) {
170170
=== modified file 'plugins/updates/gsd-updates-common.h'
--- plugins/updates/gsd-updates-common.h 2017-03-28 08:17:41 +0000
+++ plugins/updates/gsd-updates-common.h 2020-03-06 20:26:03 +0000
@@ -35,7 +35,7 @@
35#define GSD_SETTINGS_LAST_UPDATES_NOTIFICATION "last-updates-notification"35#define GSD_SETTINGS_LAST_UPDATES_NOTIFICATION "last-updates-notification"
36#define GSD_SETTINGS_MEDIA_REPO_FILENAMES "media-repo-filenames"36#define GSD_SETTINGS_MEDIA_REPO_FILENAMES "media-repo-filenames"
37#define GSD_SETTINGS_NOTIFY_DISTRO_UPGRADES "notify-distro-upgrades"37#define GSD_SETTINGS_NOTIFY_DISTRO_UPGRADES "notify-distro-upgrades"
38#define GSD_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.updates"38#define GSD_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.updates"
39#define GSD_SETTINGS_UPDATE_BATTERY "update-battery"39#define GSD_SETTINGS_UPDATE_BATTERY "update-battery"
40#define GSD_SETTINGS_AUTO_DOWNLOAD_UPDATES "auto-download-updates"40#define GSD_SETTINGS_AUTO_DOWNLOAD_UPDATES "auto-download-updates"
4141
4242
=== modified file 'plugins/updates/gsd-updates-manager.c'
--- plugins/updates/gsd-updates-manager.c 2018-02-14 12:40:59 +0000
+++ plugins/updates/gsd-updates-manager.c 2020-03-06 20:26:03 +0000
@@ -1322,7 +1322,7 @@
1322 G_CALLBACK (settings_changed_cb), manager);1322 G_CALLBACK (settings_changed_cb), manager);
13231323
1324 /* get ftp settings */1324 /* get ftp settings */
1325 manager->priv->settings_gsd = g_settings_new ("org.gnome.settings-daemon.plugins.updates");1325 manager->priv->settings_gsd = g_settings_new ("com.canonical.unity.settings-daemon.plugins.updates");
1326 g_signal_connect (manager->priv->settings_gsd, "changed",1326 g_signal_connect (manager->priv->settings_gsd, "changed",
1327 G_CALLBACK (settings_gsd_changed_cb), manager);1327 G_CALLBACK (settings_gsd_changed_cb), manager);
13281328
13291329
=== modified file 'plugins/wacom/README.config-storage'
--- plugins/wacom/README.config-storage 2012-04-25 12:40:32 +0000
+++ plugins/wacom/README.config-storage 2020-03-06 20:26:03 +0000
@@ -12,8 +12,8 @@
12configurations, whether on a single machine, or using a shared home directory.12configurations, whether on a single machine, or using a shared home directory.
1313
14The configuration scheme is:14The configuration scheme is:
15schema: org.gnome.settings-daemon.peripherals.wacom15schema: com.canonical.unity.settings-daemon.peripherals.wacom
16path: /org/gnome/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/16path: /com/canonical/unity/settings-daemon/peripherals/wacom/<machine ID>-<device ID>/
1717
18where <machine ID> is the D-Bus machine-id for the machine, and18where <machine ID> is the D-Bus machine-id for the machine, and
19<device ID> is a unique identifier for the tablet.19<device ID> is a unique identifier for the tablet.
@@ -25,10 +25,10 @@
25is the tool ID, for professional ranges, and a generic identifier for25is the tool ID, for professional ranges, and a generic identifier for
26the consumer ranges that do not support tool ID.26the consumer ranges that do not support tool ID.
2727
28schema: org.gnome.settings-daemon.peripherals.wacom.stylus28schema: com.canonical.unity.settings-daemon.peripherals.wacom.stylus
29or: org.gnome.settings-daemon.peripherals.wacom.eraser29or: com.canonical.unity.settings-daemon.peripherals.wacom.eraser
3030
31path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/31path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<tool ID>/
3232
33So each tool can be configured per tablet (so the compatible airbrush stylus33So each tool can be configured per tablet (so the compatible airbrush stylus
34will have different configurations on a Cintiq and an Intuos tablet)34will have different configurations on a Cintiq and an Intuos tablet)
@@ -36,8 +36,8 @@
36Buttons36Buttons
37-------37-------
3838
39schema: org.gnome.settings-daemon.peripherals.wacom.tablet-button39schema: com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button
40path: /org/gnome/settings-daemon/peripherals/wacom/<device ID>/<button ID>40path: /com/canonical/unity/settings-daemon/peripherals/wacom/<device ID>/<button ID>
4141
42Testing42Testing
43-------43-------
4444
=== modified file 'plugins/wacom/gsd-wacom-device.c'
--- plugins/wacom/gsd-wacom-device.c 2015-10-07 16:32:40 +0000
+++ plugins/wacom/gsd-wacom-device.c 2020-03-06 20:26:03 +0000
@@ -40,11 +40,11 @@
4040
41#define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))41#define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
4242
43#define WACOM_TABLET_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"43#define WACOM_TABLET_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom"
44#define WACOM_DEVICE_CONFIG_BASE "/org/gnome/settings-daemon/peripherals/wacom/%s-%s/"44#define WACOM_DEVICE_CONFIG_BASE "/com/canonical/unity/settings-daemon/peripherals/wacom/%s-%s/"
45#define WACOM_STYLUS_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.stylus"45#define WACOM_STYLUS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.stylus"
46#define WACOM_ERASER_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.eraser"46#define WACOM_ERASER_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.eraser"
47#define WACOM_BUTTON_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.tablet-button"47#define WACOM_BUTTON_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button"
4848
49static struct {49static struct {
50 GsdRRRotation rotation;50 GsdRRRotation rotation;
@@ -316,7 +316,7 @@
316 * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation316 * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
317 * Tool-specific settings: applied to one tool only.317 * Tool-specific settings: applied to one tool only.
318 */318 */
319#define SETTINGS_WACOM_DIR "org.gnome.settings-daemon.peripherals.wacom"319#define SETTINGS_WACOM_DIR "com.canonical.unity.settings-daemon.peripherals.wacom"
320#define SETTINGS_STYLUS_DIR "stylus"320#define SETTINGS_STYLUS_DIR "stylus"
321#define SETTINGS_ERASER_DIR "eraser"321#define SETTINGS_ERASER_DIR "eraser"
322322
323323
=== modified file 'plugins/wacom/gsd-wacom-osd-window.c'
--- plugins/wacom/gsd-wacom-osd-window.c 2013-10-04 07:53:20 +0000
+++ plugins/wacom/gsd-wacom-osd-window.c 2020-03-06 20:26:03 +0000
@@ -36,7 +36,7 @@
36#define ACTION_TYPE_KEY "action-type"36#define ACTION_TYPE_KEY "action-type"
37#define CUSTOM_ACTION_KEY "custom-action"37#define CUSTOM_ACTION_KEY "custom-action"
38#define CUSTOM_ELEVATOR_ACTION_KEY "custom-elevator-action"38#define CUSTOM_ELEVATOR_ACTION_KEY "custom-elevator-action"
39#define RES_PATH "/org/gnome/settings-daemon/plugins/wacom/"39#define RES_PATH "/com/canonical/unity/settings-daemon/plugins/wacom/"
4040
41#define BACK_OPACITY 0.841#define BACK_OPACITY 0.8
42#define INACTIVE_COLOR "#ededed"42#define INACTIVE_COLOR "#ededed"
4343
=== modified file 'plugins/wacom/wacom.gresource.xml'
--- plugins/wacom/wacom.gresource.xml 2012-12-20 10:20:29 +0000
+++ plugins/wacom/wacom.gresource.xml 2020-03-06 20:26:03 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<gresources>2<gresources>
3 <gresource prefix="/org/gnome/settings-daemon/plugins/wacom">3 <gresource prefix="/com/canonical/unity/settings-daemon/plugins/wacom">
4 <file>tablet-layout.css</file>4 <file>tablet-layout.css</file>
5 </gresource>5 </gresource>
6</gresources>6</gresources>
77
=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c 2018-04-13 18:37:56 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c 2020-03-06 20:26:03 +0000
@@ -57,7 +57,7 @@
5757
58#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))58#define GSD_XRANDR_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRANDR_MANAGER, GsdXrandrManagerPrivate))
5959
60#define CONF_SCHEMA "org.gnome.settings-daemon.plugins.xrandr"60#define CONF_SCHEMA "com.canonical.unity.settings-daemon.plugins.xrandr"
61#define CONF_KEY_DEFAULT_MONITORS_SETUP "default-monitors-setup"61#define CONF_KEY_DEFAULT_MONITORS_SETUP "default-monitors-setup"
62#define CONF_KEY_DEFAULT_CONFIGURATION_FILE "default-configuration-file"62#define CONF_KEY_DEFAULT_CONFIGURATION_FILE "default-configuration-file"
6363
6464
=== modified file 'plugins/xsettings/gsd-xsettings-gtk.c'
--- plugins/xsettings/gsd-xsettings-gtk.c 2015-10-07 15:17:20 +0000
+++ plugins/xsettings/gsd-xsettings-gtk.c 2020-03-06 20:26:03 +0000
@@ -25,7 +25,7 @@
2525
26#include "gsd-xsettings-gtk.h"26#include "gsd-xsettings-gtk.h"
2727
28#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"28#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
2929
30#define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"30#define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
31#define GTK_MODULES_ENABLED_KEY "enabled-gtk-modules"31#define GTK_MODULES_ENABLED_KEY "enabled-gtk-modules"
3232
=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c 2017-10-03 05:07:39 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c 2020-03-06 20:26:03 +0000
@@ -48,14 +48,14 @@
4848
49#define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))49#define GNOME_XSETTINGS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_XSETTINGS_MANAGER, GnomeXSettingsManagerPrivate))
5050
51#define MOUSE_SETTINGS_SCHEMA "org.gnome.settings-daemon.peripherals.mouse"51#define MOUSE_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.mouse"
52#define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"52#define INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface"
53#define UNITY_INTERFACE_SETTINGS_SCHEMA "com.ubuntu.user-interface.desktop"53#define UNITY_INTERFACE_SETTINGS_SCHEMA "com.ubuntu.user-interface.desktop"
54#define SOUND_SETTINGS_SCHEMA "org.gnome.desktop.sound"54#define SOUND_SETTINGS_SCHEMA "org.gnome.desktop.sound"
55#define PRIVACY_SETTINGS_SCHEMA "org.gnome.desktop.privacy"55#define PRIVACY_SETTINGS_SCHEMA "org.gnome.desktop.privacy"
56#define WM_SETTINGS_SCHEMA "org.gnome.desktop.wm.preferences"56#define WM_SETTINGS_SCHEMA "org.gnome.desktop.wm.preferences"
5757
58#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"58#define XSETTINGS_PLUGIN_SCHEMA "com.canonical.unity.settings-daemon.plugins.xsettings"
59#define XSETTINGS_OVERRIDE_KEY "overrides"59#define XSETTINGS_OVERRIDE_KEY "overrides"
6060
61#define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"61#define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
@@ -367,8 +367,8 @@
367}367}
368368
369static TranslationEntry translations [] = {369static TranslationEntry translations [] = {
370 { "org.gnome.settings-daemon.peripherals.mouse", "double-click", "Net/DoubleClickTime", translate_int_int },370 { "com.canonical.unity.settings-daemon.peripherals.mouse", "double-click", "Net/DoubleClickTime", translate_int_int },
371 { "org.gnome.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },371 { "com.canonical.unity.settings-daemon.peripherals.mouse", "drag-threshold", "Net/DndDragThreshold", translate_int_int },
372372
373 { "org.gnome.desktop.interface", "gtk-color-palette", "Gtk/ColorPalette", translate_string_string },373 { "org.gnome.desktop.interface", "gtk-color-palette", "Gtk/ColorPalette", translate_string_string },
374 { "org.gnome.desktop.interface", "font-name", "Gtk/FontName", translate_string_string },374 { "org.gnome.desktop.interface", "font-name", "Gtk/FontName", translate_string_string },

Subscribers

People subscribed via source and target branches