Merge lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon
- use-usd-schemas
- Merge into trunk
Proposed by
Khurshid Alam
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | 4199 |
Merged at revision: | 4196 |
Proposed branch: | lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas |
Merge into: | lp:unity-settings-daemon |
Diff against target: |
409 lines (+265/-12) 7 files modified
data/Makefile.am (+12/-1) data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in (+228/-0) debian/control (+10/-0) debian/unity-settings-daemon-schemas.install (+1/-0) plugins/keyboard/gsd-keyboard-manager.c (+5/-4) plugins/media-keys/shortcuts-list.h (+1/-1) plugins/mouse/gsd-mouse-manager.c (+8/-6) |
To merge this branch: | bzr merge lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Sebastien Bacher | Pending | ||
Review via email: mp+372154@code.launchpad.net |
Commit message
* Port media keys to use com.canonical.
u-s-d will still use org.gnome.
* Use new gsettings key location for mouse & keyboard.
https:/
https:/
Description of the change
To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
As per comments in https:/
review:
Needs Fixing
- 4199. By Khurshid Alam
-
Use <Control><Alt>l to lock the screen
Revision history for this message
Khurshid Alam (khurshid-alam) wrote : | # |
Ok. Done.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/Makefile.am' | |||
2 | --- data/Makefile.am 2014-08-29 10:24:00 +0000 | |||
3 | +++ data/Makefile.am 2019-09-06 22:29:15 +0000 | |||
4 | @@ -3,6 +3,14 @@ | |||
5 | 3 | apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon | 3 | apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon |
6 | 4 | api_DATA = gsd-enums.h | 4 | api_DATA = gsd-enums.h |
7 | 5 | 5 | ||
8 | 6 | gschema_in_files = com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in | ||
9 | 7 | gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml) | ||
10 | 8 | |||
11 | 9 | gsettingsdir = $(datadir)/glib-2.0/schemas | ||
12 | 10 | |||
13 | 11 | %.gschema.xml.in: %.gschema.xml.in.in | ||
14 | 12 | $(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@ | ||
15 | 13 | |||
16 | 6 | @INTLTOOL_XML_NOMERGE_RULE@ | 14 | @INTLTOOL_XML_NOMERGE_RULE@ |
17 | 7 | 15 | ||
18 | 8 | @GSETTINGS_RULES@ | 16 | @GSETTINGS_RULES@ |
19 | @@ -22,6 +30,7 @@ | |||
20 | 22 | 30 | ||
21 | 23 | EXTRA_DIST = \ | 31 | EXTRA_DIST = \ |
22 | 24 | $(convert_DATA) \ | 32 | $(convert_DATA) \ |
23 | 33 | $(gschema_in_files) \ | ||
24 | 25 | $(desktop_in_files) \ | 34 | $(desktop_in_files) \ |
25 | 26 | $(gsettings_ENUM_FILES) \ | 35 | $(gsettings_ENUM_FILES) \ |
26 | 27 | unity-settings-daemon.pc.in \ | 36 | unity-settings-daemon.pc.in \ |
27 | @@ -36,4 +45,6 @@ | |||
28 | 36 | 45 | ||
29 | 37 | MAINTAINERCLEANFILES = \ | 46 | MAINTAINERCLEANFILES = \ |
30 | 38 | *~ \ | 47 | *~ \ |
32 | 39 | Makefile.in | 48 | Makefile.in \ |
33 | 49 | $(gsettings_SCHEMAS:.xml=.valid) | ||
34 | 50 | |||
35 | 40 | 51 | ||
36 | === added file 'data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in' | |||
37 | --- data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 1970-01-01 00:00:00 +0000 | |||
38 | +++ data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 2019-09-06 22:29:15 +0000 | |||
39 | @@ -0,0 +1,228 @@ | |||
40 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
41 | 2 | <schemalist> | ||
42 | 3 | <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/"> | ||
43 | 4 | <key name="priority" type="i"> | ||
44 | 5 | <default>0</default> | ||
45 | 6 | <summary>Priority to use for this plugin</summary> | ||
46 | 7 | <description>Priority to use for this plugin in unity-settings-daemon startup queue</description> | ||
47 | 8 | </key> | ||
48 | 9 | <key name="active" type="b"> | ||
49 | 10 | <default>true</default> | ||
50 | 11 | <summary>Activation of this plugin</summary> | ||
51 | 12 | <description>Whether this plugin would be activated by unity-settings-daemon or not</description> | ||
52 | 13 | </key> | ||
53 | 14 | <key name="custom-keybindings" type="as"> | ||
54 | 15 | <default>[]</default> | ||
55 | 16 | <summary>Custom keybindings</summary> | ||
56 | 17 | <description>List of custom keybindings</description> | ||
57 | 18 | </key> | ||
58 | 19 | <key name="calculator" type="s"> | ||
59 | 20 | <default>'XF86Calculator'</default> | ||
60 | 21 | <summary>Launch calculator</summary> | ||
61 | 22 | <description>Binding to launch the calculator.</description> | ||
62 | 23 | </key> | ||
63 | 24 | <key name="control-center" type="s"> | ||
64 | 25 | <default>'XF86Tools'</default> | ||
65 | 26 | <summary>Launch settings</summary> | ||
66 | 27 | <description>Binding to launch GNOME settings.</description> | ||
67 | 28 | </key> | ||
68 | 29 | <key name="email" type="s"> | ||
69 | 30 | <default>'XF86Mail'</default> | ||
70 | 31 | <summary>Launch email client</summary> | ||
71 | 32 | <description>Binding to launch the email client.</description> | ||
72 | 33 | </key> | ||
73 | 34 | <key name="eject" type="s"> | ||
74 | 35 | <default>'XF86Eject'</default> | ||
75 | 36 | <summary>Eject</summary> | ||
76 | 37 | <description>Binding to eject an optical disc.</description> | ||
77 | 38 | </key> | ||
78 | 39 | <key name="help" type="s"> | ||
79 | 40 | <default>''</default> | ||
80 | 41 | <summary>Launch help browser</summary> | ||
81 | 42 | <description>Binding to launch the help browser.</description> | ||
82 | 43 | </key> | ||
83 | 44 | <key name="home" type="s"> | ||
84 | 45 | <default>'XF86Explorer'</default> | ||
85 | 46 | <summary>Home folder</summary> | ||
86 | 47 | <description>Binding to open the Home folder.</description> | ||
87 | 48 | </key> | ||
88 | 49 | <key name="media" type="s"> | ||
89 | 50 | <default>'XF86AudioMedia'</default> | ||
90 | 51 | <summary>Launch media player</summary> | ||
91 | 52 | <description>Binding to launch the media player.</description> | ||
92 | 53 | </key> | ||
93 | 54 | <key name="next" type="s"> | ||
94 | 55 | <default>'XF86AudioNext'</default> | ||
95 | 56 | <summary>Next track</summary> | ||
96 | 57 | <description>Binding to skip to next track.</description> | ||
97 | 58 | </key> | ||
98 | 59 | <key name="pause" type="s"> | ||
99 | 60 | <default>'XF86AudioPause'</default> | ||
100 | 61 | <summary>Pause playback</summary> | ||
101 | 62 | <description>Binding to pause playback.</description> | ||
102 | 63 | </key> | ||
103 | 64 | <key name="play" type="s"> | ||
104 | 65 | <default>'XF86AudioPlay'</default> | ||
105 | 66 | <summary>Play (or play/pause)</summary> | ||
106 | 67 | <description>Binding to start playback (or toggle play/pause).</description> | ||
107 | 68 | </key> | ||
108 | 69 | <key name="logout" type="s"> | ||
109 | 70 | <default>'<Control><Alt>Delete'</default> | ||
110 | 71 | <summary>Log out</summary> | ||
111 | 72 | <description>Binding to log out.</description> | ||
112 | 73 | </key> | ||
113 | 74 | <key name="previous" type="s"> | ||
114 | 75 | <default>'XF86AudioPrev'</default> | ||
115 | 76 | <summary>Previous track</summary> | ||
116 | 77 | <description>Binding to skip to previous track.</description> | ||
117 | 78 | </key> | ||
118 | 79 | <key name="screensaver" type="s"> | ||
119 | 80 | <default>'<Control><Alt>l'</default> | ||
120 | 81 | <summary>Lock screen</summary> | ||
121 | 82 | <description>Binding to lock the screen.</description> | ||
122 | 83 | </key> | ||
123 | 84 | <key name="search" type="s"> | ||
124 | 85 | <default>'XF86Search'</default> | ||
125 | 86 | <summary>Search</summary> | ||
126 | 87 | <description>Binding to launch the search tool.</description> | ||
127 | 88 | </key> | ||
128 | 89 | <key name="stop" type="s"> | ||
129 | 90 | <default>'XF86AudioStop'</default> | ||
130 | 91 | <summary>Stop playback</summary> | ||
131 | 92 | <description>Binding to stop playback.</description> | ||
132 | 93 | </key> | ||
133 | 94 | <key name="video-out" type="s"> | ||
134 | 95 | <default>'<Super>p'</default> | ||
135 | 96 | <summary>Video output</summary> | ||
136 | 97 | <description>Binding to switch the video output device.</description> | ||
137 | 98 | </key> | ||
138 | 99 | <key name="volume-down" type="s"> | ||
139 | 100 | <default>'XF86AudioLowerVolume'</default> | ||
140 | 101 | <summary>Volume down</summary> | ||
141 | 102 | <description>Binding to lower the volume.</description> | ||
142 | 103 | </key> | ||
143 | 104 | <key name="volume-mute" type="s"> | ||
144 | 105 | <default>'XF86AudioMute'</default> | ||
145 | 106 | <summary>Volume mute/unmute</summary> | ||
146 | 107 | <description>Binding to mute/unmute the volume.</description> | ||
147 | 108 | </key> | ||
148 | 109 | <key name="volume-up" type="s"> | ||
149 | 110 | <default>'XF86AudioRaiseVolume'</default> | ||
150 | 111 | <summary>Volume up</summary> | ||
151 | 112 | <description>Binding to raise the volume.</description> | ||
152 | 113 | </key> | ||
153 | 114 | <key name="mic-mute" type="s"> | ||
154 | 115 | <default>'XF86AudioMicMute'</default> | ||
155 | 116 | <summary>Microphone mute/unmute</summary> | ||
156 | 117 | <description>Binding to mute/unmute the microphone.</description> | ||
157 | 118 | </key> | ||
158 | 119 | <key name="screenshot" type="s"> | ||
159 | 120 | <default>'Print'</default> | ||
160 | 121 | <summary>Take a screenshot</summary> | ||
161 | 122 | <description>Binding to take a screenshot.</description> | ||
162 | 123 | </key> | ||
163 | 124 | <key name="window-screenshot" type="s"> | ||
164 | 125 | <default>'<Alt>Print'</default> | ||
165 | 126 | <summary>Take a screenshot of a window</summary> | ||
166 | 127 | <description>Binding to take a screenshot of a window.</description> | ||
167 | 128 | </key> | ||
168 | 129 | <key name="area-screenshot" type="s"> | ||
169 | 130 | <default>'<Shift>Print'</default> | ||
170 | 131 | <summary>Take a screenshot of an area</summary> | ||
171 | 132 | <description>Binding to take a screenshot of an area.</description> | ||
172 | 133 | </key> | ||
173 | 134 | <key name="screenshot-clip" type="s"> | ||
174 | 135 | <default>'<Ctrl>Print'</default> | ||
175 | 136 | <summary>Copy a screenshot to clipboard</summary> | ||
176 | 137 | <description>Binding to copy a screenshot to clipboard.</description> | ||
177 | 138 | </key> | ||
178 | 139 | <key name="window-screenshot-clip" type="s"> | ||
179 | 140 | <default>'<Ctrl><Alt>Print'</default> | ||
180 | 141 | <summary>Copy a screenshot of a window to clipboard</summary> | ||
181 | 142 | <description>Binding to copy a screenshot of a window to clipboard.</description> | ||
182 | 143 | </key> | ||
183 | 144 | <key name="area-screenshot-clip" type="s"> | ||
184 | 145 | <default>'<Ctrl><Shift>Print'</default> | ||
185 | 146 | <summary>Copy a screenshot of an area to clipboard</summary> | ||
186 | 147 | <description>Binding to copy a screenshot of an area to clipboard.</description> | ||
187 | 148 | </key> | ||
188 | 149 | <key name="screencast" type="s"> | ||
189 | 150 | <default>'<Ctrl><Shift><Alt>R'</default> | ||
190 | 151 | <summary>Record a short video of the screen</summary> | ||
191 | 152 | <description>Binding to record a short video of the screen</description> | ||
192 | 153 | </key> | ||
193 | 154 | <key name="terminal" type="s"> | ||
194 | 155 | <default>'<Primary><Alt>t'</default> | ||
195 | 156 | <summary>Launch terminal</summary> | ||
196 | 157 | <description>Binding to launch the terminal.</description> | ||
197 | 158 | </key> | ||
198 | 159 | <key name="www" type="s"> | ||
199 | 160 | <default>'XF86WWW'</default> | ||
200 | 161 | <summary>Launch web browser</summary> | ||
201 | 162 | <description>Binding to launch the web browser.</description> | ||
202 | 163 | </key> | ||
203 | 164 | <key name="magnifier" type="s"> | ||
204 | 165 | <default>'<Alt><Super>8'</default> | ||
205 | 166 | <summary>Toggle magnifier</summary> | ||
206 | 167 | <description>Binding to show the screen magnifier</description> | ||
207 | 168 | </key> | ||
208 | 169 | <key name="screenreader" type="s"> | ||
209 | 170 | <default>'<Alt><Super>s'</default> | ||
210 | 171 | <summary>Toggle screen reader</summary> | ||
211 | 172 | <description>Binding to start the screen reader</description> | ||
212 | 173 | </key> | ||
213 | 174 | <key name="on-screen-keyboard" type="s"> | ||
214 | 175 | <default>''</default> | ||
215 | 176 | <summary>Toggle on-screen keyboard</summary> | ||
216 | 177 | <description>Binding to show the on-screen keyboard</description> | ||
217 | 178 | </key> | ||
218 | 179 | <key name="increase-text-size" type="s"> | ||
219 | 180 | <default>''</default> | ||
220 | 181 | <summary>Increase text size</summary> | ||
221 | 182 | <description>Binding to increase the text size</description> | ||
222 | 183 | </key> | ||
223 | 184 | <key name="decrease-text-size" type="s"> | ||
224 | 185 | <default>''</default> | ||
225 | 186 | <summary>Decrease text size</summary> | ||
226 | 187 | <description>Binding to decrease the text size</description> | ||
227 | 188 | </key> | ||
228 | 189 | <key name="toggle-contrast" type="s"> | ||
229 | 190 | <default>''</default> | ||
230 | 191 | <summary>Toggle contrast</summary> | ||
231 | 192 | <description>Binding to toggle the interface contrast</description> | ||
232 | 193 | </key> | ||
233 | 194 | <key name="magnifier-zoom-in" type="s"> | ||
234 | 195 | <default>'<Alt><Super>equal'</default> | ||
235 | 196 | <summary>Magnifier zoom in</summary> | ||
236 | 197 | <description>Binding for the magnifier to zoom in</description> | ||
237 | 198 | </key> | ||
238 | 199 | <key name="magnifier-zoom-out" type="s"> | ||
239 | 200 | <default>'<Alt><Super>minus'</default> | ||
240 | 201 | <summary>Magnifier zoom out</summary> | ||
241 | 202 | <description>Binding for the magnifier to zoom out</description> | ||
242 | 203 | </key> | ||
243 | 204 | <key name="max-screencast-length" type="u"> | ||
244 | 205 | <default>30</default> | ||
245 | 206 | <summary>Maximum length of screen recordings</summary> | ||
246 | 207 | <description>The maximum length of single screen cast recordings in seconds or 0 for unlimited</description> | ||
247 | 208 | </key> | ||
248 | 209 | </schema> | ||
249 | 210 | |||
250 | 211 | <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"> | ||
251 | 212 | <key name="name" type="s"> | ||
252 | 213 | <default>''</default> | ||
253 | 214 | <summary>Name</summary> | ||
254 | 215 | <description>Name of the custom binding</description> | ||
255 | 216 | </key> | ||
256 | 217 | <key name="binding" type="s"> | ||
257 | 218 | <default>''</default> | ||
258 | 219 | <summary>Binding</summary> | ||
259 | 220 | <description>Binding for the custom binding</description> | ||
260 | 221 | </key> | ||
261 | 222 | <key name="command" type="s"> | ||
262 | 223 | <default>''</default> | ||
263 | 224 | <summary>Command</summary> | ||
264 | 225 | <description>Command to run when the binding is invoked</description> | ||
265 | 226 | </key> | ||
266 | 227 | </schema> | ||
267 | 228 | </schemalist> | ||
268 | 0 | 229 | ||
269 | === modified file 'debian/control' | |||
270 | --- debian/control 2019-01-09 16:46:14 +0000 | |||
271 | +++ debian/control 2019-09-06 22:29:15 +0000 | |||
272 | @@ -58,6 +58,7 @@ | |||
273 | 58 | accountsservice (>= 0.6.34), | 58 | accountsservice (>= 0.6.34), |
274 | 59 | gsettings-desktop-schemas (>= 3.15.4), | 59 | gsettings-desktop-schemas (>= 3.15.4), |
275 | 60 | nautilus-data (>= 2.91.3-1), | 60 | nautilus-data (>= 2.91.3-1), |
276 | 61 | unity-settings-daemon-schemas (>= ${source:Version}), | ||
277 | 61 | gnome-settings-daemon-common (>= 3.16), | 62 | gnome-settings-daemon-common (>= 3.16), |
278 | 62 | gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922), | 63 | gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922), |
279 | 63 | Recommends: ibus (>= 1.5.0), | 64 | Recommends: ibus (>= 1.5.0), |
280 | @@ -103,6 +104,15 @@ | |||
281 | 103 | Description: Headers for building applications communicating with unity-settings-daemon | 104 | Description: Headers for building applications communicating with unity-settings-daemon |
282 | 104 | This package contains header files required to build applications that | 105 | This package contains header files required to build applications that |
283 | 105 | communicate with the Unity settings daemon over D-Bus. | 106 | communicate with the Unity settings daemon over D-Bus. |
284 | 107 | |||
285 | 108 | Package: unity-settings-daemon-schemas | ||
286 | 109 | Architecture: all | ||
287 | 110 | Depends: ${misc:Depends} | ||
288 | 111 | Replaces: gnome-settings-daemon (<< 3.20.1-2ubuntu1~) | ||
289 | 112 | Breaks: gnome-settings-daemon (<< 3.20.1-2ubuntu1~) | ||
290 | 113 | Description: Shared schemas for gnome-settings-daemon | ||
291 | 114 | This package contains the gsettings schemas used by | ||
292 | 115 | unity-settings-daemon. | ||
293 | 106 | 116 | ||
294 | 107 | Package: libunity-settings-daemon1 | 117 | Package: libunity-settings-daemon1 |
295 | 108 | Architecture: any | 118 | Architecture: any |
296 | 109 | 119 | ||
297 | === added file 'debian/unity-settings-daemon-schemas.install' | |||
298 | --- debian/unity-settings-daemon-schemas.install 1970-01-01 00:00:00 +0000 | |||
299 | +++ debian/unity-settings-daemon-schemas.install 2019-09-06 22:29:15 +0000 | |||
300 | @@ -0,0 +1,1 @@ | |||
301 | 1 | debian/*/usr/share/glib-*/schemas/* | ||
302 | 0 | 2 | ||
303 | === modified file 'plugins/keyboard/gsd-keyboard-manager.c' | |||
304 | --- plugins/keyboard/gsd-keyboard-manager.c 2016-10-03 09:57:23 +0000 | |||
305 | +++ plugins/keyboard/gsd-keyboard-manager.c 2019-09-06 22:29:15 +0000 | |||
306 | @@ -685,7 +685,7 @@ | |||
307 | 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'", |
308 | 686 | num_lock_state_to_string (numlock_state), | 686 | num_lock_state_to_string (numlock_state), |
309 | 687 | num_lock_state_to_string (manager->priv->old_state)); | 687 | num_lock_state_to_string (manager->priv->old_state)); |
311 | 688 | g_settings_set_enum (manager->priv->settings, | 688 | g_settings_set_enum (manager->priv->gsettings, |
312 | 689 | KEY_NUMLOCK_STATE, | 689 | KEY_NUMLOCK_STATE, |
313 | 690 | numlock_state); | 690 | numlock_state); |
314 | 691 | manager->priv->old_state = numlock_state; | 691 | manager->priv->old_state = numlock_state; |
315 | @@ -1793,9 +1793,9 @@ | |||
316 | 1793 | gboolean rnumlock; | 1793 | gboolean rnumlock; |
317 | 1794 | 1794 | ||
318 | 1795 | g_debug ("Applying the num-lock settings"); | 1795 | g_debug ("Applying the num-lock settings"); |
320 | 1796 | settings = manager->priv->settings; | 1796 | settings = manager->priv->gsettings; |
321 | 1797 | rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE); | 1797 | rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE); |
323 | 1798 | manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE); | 1798 | manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE); |
324 | 1799 | 1799 | ||
325 | 1800 | gdk_error_trap_push (); | 1800 | gdk_error_trap_push (); |
326 | 1801 | if (rnumlock) { | 1801 | if (rnumlock) { |
327 | @@ -2629,7 +2629,8 @@ | |||
328 | 2629 | GsdSettingsMigrateEntry entries[] = { | 2629 | GsdSettingsMigrateEntry entries[] = { |
329 | 2630 | { "repeat", "repeat", NULL }, | 2630 | { "repeat", "repeat", NULL }, |
330 | 2631 | { "repeat-interval", "repeat-interval", NULL }, | 2631 | { "repeat-interval", "repeat-interval", NULL }, |
332 | 2632 | { "delay", "delay", NULL } | 2632 | { "delay", "delay", NULL }, |
333 | 2633 | { "remember-numlock-state", "remember-numlock-state", NULL }, | ||
334 | 2633 | }; | 2634 | }; |
335 | 2634 | 2635 | ||
336 | 2635 | gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated", | 2636 | gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated", |
337 | 2636 | 2637 | ||
338 | === modified file 'plugins/media-keys/shortcuts-list.h' | |||
339 | --- plugins/media-keys/shortcuts-list.h 2014-03-14 06:27:10 +0000 | |||
340 | +++ plugins/media-keys/shortcuts-list.h 2019-09-06 22:29:15 +0000 | |||
341 | @@ -24,7 +24,7 @@ | |||
342 | 24 | #include "shell-keybinding-modes.h" | 24 | #include "shell-keybinding-modes.h" |
343 | 25 | #include "gsd-keygrab.h" | 25 | #include "gsd-keygrab.h" |
344 | 26 | 26 | ||
346 | 27 | #define SETTINGS_BINDING_DIR "org.gnome.settings-daemon.plugins.media-keys" | 27 | #define SETTINGS_BINDING_DIR "com.canonical.unity.settings-daemon.plugins.media-keys" |
347 | 28 | #define INPUT_SETTINGS_BINDING_DIR "org.gnome.desktop.wm.keybindings" | 28 | #define INPUT_SETTINGS_BINDING_DIR "org.gnome.desktop.wm.keybindings" |
348 | 29 | 29 | ||
349 | 30 | typedef enum { | 30 | typedef enum { |
350 | 31 | 31 | ||
351 | === modified file 'plugins/mouse/gsd-mouse-manager.c' | |||
352 | --- plugins/mouse/gsd-mouse-manager.c 2015-10-07 16:32:40 +0000 | |||
353 | +++ plugins/mouse/gsd-mouse-manager.c 2019-09-06 22:29:15 +0000 | |||
354 | @@ -57,7 +57,7 @@ | |||
355 | 57 | 57 | ||
356 | 58 | #define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate)) | 58 | #define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate)) |
357 | 59 | 59 | ||
359 | 60 | #define GSD_SETTINGS_MOUSE_SCHEMA "org.gnome.settings-daemon.peripherals.mouse" | 60 | #define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface" |
360 | 61 | #define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse" | 61 | #define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse" |
361 | 62 | #define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad" | 62 | #define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad" |
362 | 63 | 63 | ||
363 | @@ -82,7 +82,7 @@ | |||
364 | 82 | GSettings *touchpad_settings; | 82 | GSettings *touchpad_settings; |
365 | 83 | GSettings *mouse_settings; | 83 | GSettings *mouse_settings; |
366 | 84 | GSettings *mouse_a11y_settings; | 84 | GSettings *mouse_a11y_settings; |
368 | 85 | GSettings *gsd_mouse_settings; | 85 | GSettings *interface_settings; |
369 | 86 | GdkDeviceManager *device_manager; | 86 | GdkDeviceManager *device_manager; |
370 | 87 | guint device_added_id; | 87 | guint device_added_id; |
371 | 88 | guint device_removed_id; | 88 | guint device_removed_id; |
372 | @@ -851,7 +851,7 @@ | |||
373 | 851 | manager->priv->locate_pointer_spawned = (error == NULL); | 851 | manager->priv->locate_pointer_spawned = (error == NULL); |
374 | 852 | 852 | ||
375 | 853 | if (error) { | 853 | if (error) { |
377 | 854 | g_settings_set_boolean (manager->priv->gsd_mouse_settings, KEY_LOCATE_POINTER, FALSE); | 854 | g_settings_set_boolean (manager->priv->interface_settings, KEY_LOCATE_POINTER, FALSE); |
378 | 855 | g_error_free (error); | 855 | g_error_free (error); |
379 | 856 | } | 856 | } |
380 | 857 | 857 | ||
381 | @@ -1223,8 +1223,8 @@ | |||
382 | 1223 | 1223 | ||
383 | 1224 | set_devicepresence_handler (manager); | 1224 | set_devicepresence_handler (manager); |
384 | 1225 | 1225 | ||
387 | 1226 | manager->priv->gsd_mouse_settings = g_settings_new (GSD_SETTINGS_MOUSE_SCHEMA); | 1226 | manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR); |
388 | 1227 | g_signal_connect (manager->priv->gsd_mouse_settings, "changed", | 1227 | g_signal_connect (manager->priv->interface_settings, "changed", |
389 | 1228 | G_CALLBACK (mouse_callback), manager); | 1228 | G_CALLBACK (mouse_callback), manager); |
390 | 1229 | 1229 | ||
391 | 1230 | manager->priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse"); | 1230 | manager->priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse"); |
392 | @@ -1241,7 +1241,7 @@ | |||
393 | 1241 | 1241 | ||
394 | 1242 | manager->priv->syndaemon_spawned = FALSE; | 1242 | manager->priv->syndaemon_spawned = FALSE; |
395 | 1243 | 1243 | ||
397 | 1244 | set_locate_pointer (manager, g_settings_get_boolean (manager->priv->gsd_mouse_settings, KEY_LOCATE_POINTER)); | 1244 | set_locate_pointer (manager, g_settings_get_boolean (manager->priv->interface_settings, KEY_LOCATE_POINTER)); |
398 | 1245 | set_mousetweaks_daemon (manager, | 1245 | set_mousetweaks_daemon (manager, |
399 | 1246 | g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_DWELL_CLICK_ENABLED), | 1246 | g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_DWELL_CLICK_ENABLED), |
400 | 1247 | g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_SECONDARY_CLICK_ENABLED)); | 1247 | g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_SECONDARY_CLICK_ENABLED)); |
401 | @@ -1326,6 +1326,8 @@ | |||
402 | 1326 | g_clear_object (&p->touchpad_settings); | 1326 | g_clear_object (&p->touchpad_settings); |
403 | 1327 | 1327 | ||
404 | 1328 | set_locate_pointer (manager, FALSE); | 1328 | set_locate_pointer (manager, FALSE); |
405 | 1329 | |||
406 | 1330 | g_clear_object (&p->interface_settings); | ||
407 | 1329 | } | 1331 | } |
408 | 1330 | 1332 | ||
409 | 1331 | static void | 1333 | static void |
Looks good to me, would have been nice in a further iteration to change the settings/gsettings naming to something clearer, but not a fault of this MR.