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

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
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.unity.settings-daemon
  u-s-d will still use org.gnome.settings-daemon in dbus. LP: #1842324

* Use new gsettings key location for mouse & keyboard.

  https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/6dff93a0dfa80db3f481eed5d6ed689bf469aa1b

  https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/710a4c4e7828828cb35ea14333882354ae73264f

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :
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
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2014-08-29 10:24:00 +0000
+++ data/Makefile.am 2019-09-06 22:29:15 +0000
@@ -3,6 +3,14 @@
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.in
7gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
8
9gsettingsdir = $(datadir)/glib-2.0/schemas
10
11%.gschema.xml.in: %.gschema.xml.in.in
12 $(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
13
6@INTLTOOL_XML_NOMERGE_RULE@14@INTLTOOL_XML_NOMERGE_RULE@
715
8@GSETTINGS_RULES@16@GSETTINGS_RULES@
@@ -22,6 +30,7 @@
2230
23EXTRA_DIST = \31EXTRA_DIST = \
24 $(convert_DATA) \32 $(convert_DATA) \
33 $(gschema_in_files) \
25 $(desktop_in_files) \34 $(desktop_in_files) \
26 $(gsettings_ENUM_FILES) \35 $(gsettings_ENUM_FILES) \
27 unity-settings-daemon.pc.in \36 unity-settings-daemon.pc.in \
@@ -36,4 +45,6 @@
3645
37MAINTAINERCLEANFILES = \46MAINTAINERCLEANFILES = \
38 *~ \47 *~ \
39 Makefile.in48 Makefile.in \
49 $(gsettings_SCHEMAS:.xml=.valid)
50
4051
=== added file 'data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 2019-09-06 22:29:15 +0000
@@ -0,0 +1,228 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<schemalist>
3 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/">
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="custom-keybindings" type="as">
15 <default>[]</default>
16 <summary>Custom keybindings</summary>
17 <description>List of custom keybindings</description>
18 </key>
19 <key name="calculator" type="s">
20 <default>'XF86Calculator'</default>
21 <summary>Launch calculator</summary>
22 <description>Binding to launch the calculator.</description>
23 </key>
24 <key name="control-center" type="s">
25 <default>'XF86Tools'</default>
26 <summary>Launch settings</summary>
27 <description>Binding to launch GNOME settings.</description>
28 </key>
29 <key name="email" type="s">
30 <default>'XF86Mail'</default>
31 <summary>Launch email client</summary>
32 <description>Binding to launch the email client.</description>
33 </key>
34 <key name="eject" type="s">
35 <default>'XF86Eject'</default>
36 <summary>Eject</summary>
37 <description>Binding to eject an optical disc.</description>
38 </key>
39 <key name="help" type="s">
40 <default>''</default>
41 <summary>Launch help browser</summary>
42 <description>Binding to launch the help browser.</description>
43 </key>
44 <key name="home" type="s">
45 <default>'XF86Explorer'</default>
46 <summary>Home folder</summary>
47 <description>Binding to open the Home folder.</description>
48 </key>
49 <key name="media" type="s">
50 <default>'XF86AudioMedia'</default>
51 <summary>Launch media player</summary>
52 <description>Binding to launch the media player.</description>
53 </key>
54 <key name="next" type="s">
55 <default>'XF86AudioNext'</default>
56 <summary>Next track</summary>
57 <description>Binding to skip to next track.</description>
58 </key>
59 <key name="pause" type="s">
60 <default>'XF86AudioPause'</default>
61 <summary>Pause playback</summary>
62 <description>Binding to pause playback.</description>
63 </key>
64 <key name="play" type="s">
65 <default>'XF86AudioPlay'</default>
66 <summary>Play (or play/pause)</summary>
67 <description>Binding to start playback (or toggle play/pause).</description>
68 </key>
69 <key name="logout" type="s">
70 <default>'&lt;Control&gt;&lt;Alt&gt;Delete'</default>
71 <summary>Log out</summary>
72 <description>Binding to log out.</description>
73 </key>
74 <key name="previous" type="s">
75 <default>'XF86AudioPrev'</default>
76 <summary>Previous track</summary>
77 <description>Binding to skip to previous track.</description>
78 </key>
79 <key name="screensaver" type="s">
80 <default>'&lt;Control&gt;&lt;Alt&gt;l'</default>
81 <summary>Lock screen</summary>
82 <description>Binding to lock the screen.</description>
83 </key>
84 <key name="search" type="s">
85 <default>'XF86Search'</default>
86 <summary>Search</summary>
87 <description>Binding to launch the search tool.</description>
88 </key>
89 <key name="stop" type="s">
90 <default>'XF86AudioStop'</default>
91 <summary>Stop playback</summary>
92 <description>Binding to stop playback.</description>
93 </key>
94 <key name="video-out" type="s">
95 <default>'&lt;Super&gt;p'</default>
96 <summary>Video output</summary>
97 <description>Binding to switch the video output device.</description>
98 </key>
99 <key name="volume-down" type="s">
100 <default>'XF86AudioLowerVolume'</default>
101 <summary>Volume down</summary>
102 <description>Binding to lower the volume.</description>
103 </key>
104 <key name="volume-mute" type="s">
105 <default>'XF86AudioMute'</default>
106 <summary>Volume mute/unmute</summary>
107 <description>Binding to mute/unmute the volume.</description>
108 </key>
109 <key name="volume-up" type="s">
110 <default>'XF86AudioRaiseVolume'</default>
111 <summary>Volume up</summary>
112 <description>Binding to raise the volume.</description>
113 </key>
114 <key name="mic-mute" type="s">
115 <default>'XF86AudioMicMute'</default>
116 <summary>Microphone mute/unmute</summary>
117 <description>Binding to mute/unmute the microphone.</description>
118 </key>
119 <key name="screenshot" type="s">
120 <default>'Print'</default>
121 <summary>Take a screenshot</summary>
122 <description>Binding to take a screenshot.</description>
123 </key>
124 <key name="window-screenshot" type="s">
125 <default>'&lt;Alt&gt;Print'</default>
126 <summary>Take a screenshot of a window</summary>
127 <description>Binding to take a screenshot of a window.</description>
128 </key>
129 <key name="area-screenshot" type="s">
130 <default>'&lt;Shift&gt;Print'</default>
131 <summary>Take a screenshot of an area</summary>
132 <description>Binding to take a screenshot of an area.</description>
133 </key>
134 <key name="screenshot-clip" type="s">
135 <default>'&lt;Ctrl&gt;Print'</default>
136 <summary>Copy a screenshot to clipboard</summary>
137 <description>Binding to copy a screenshot to clipboard.</description>
138 </key>
139 <key name="window-screenshot-clip" type="s">
140 <default>'&lt;Ctrl&gt;&lt;Alt&gt;Print'</default>
141 <summary>Copy a screenshot of a window to clipboard</summary>
142 <description>Binding to copy a screenshot of a window to clipboard.</description>
143 </key>
144 <key name="area-screenshot-clip" type="s">
145 <default>'&lt;Ctrl&gt;&lt;Shift&gt;Print'</default>
146 <summary>Copy a screenshot of an area to clipboard</summary>
147 <description>Binding to copy a screenshot of an area to clipboard.</description>
148 </key>
149 <key name="screencast" type="s">
150 <default>'&lt;Ctrl&gt;&lt;Shift&gt;&lt;Alt&gt;R'</default>
151 <summary>Record a short video of the screen</summary>
152 <description>Binding to record a short video of the screen</description>
153 </key>
154 <key name="terminal" type="s">
155 <default>'&lt;Primary&gt;&lt;Alt&gt;t'</default>
156 <summary>Launch terminal</summary>
157 <description>Binding to launch the terminal.</description>
158 </key>
159 <key name="www" type="s">
160 <default>'XF86WWW'</default>
161 <summary>Launch web browser</summary>
162 <description>Binding to launch the web browser.</description>
163 </key>
164 <key name="magnifier" type="s">
165 <default>'&lt;Alt&gt;&lt;Super&gt;8'</default>
166 <summary>Toggle magnifier</summary>
167 <description>Binding to show the screen magnifier</description>
168 </key>
169 <key name="screenreader" type="s">
170 <default>'&lt;Alt&gt;&lt;Super&gt;s'</default>
171 <summary>Toggle screen reader</summary>
172 <description>Binding to start the screen reader</description>
173 </key>
174 <key name="on-screen-keyboard" type="s">
175 <default>''</default>
176 <summary>Toggle on-screen keyboard</summary>
177 <description>Binding to show the on-screen keyboard</description>
178 </key>
179 <key name="increase-text-size" type="s">
180 <default>''</default>
181 <summary>Increase text size</summary>
182 <description>Binding to increase the text size</description>
183 </key>
184 <key name="decrease-text-size" type="s">
185 <default>''</default>
186 <summary>Decrease text size</summary>
187 <description>Binding to decrease the text size</description>
188 </key>
189 <key name="toggle-contrast" type="s">
190 <default>''</default>
191 <summary>Toggle contrast</summary>
192 <description>Binding to toggle the interface contrast</description>
193 </key>
194 <key name="magnifier-zoom-in" type="s">
195 <default>'&lt;Alt&gt;&lt;Super&gt;equal'</default>
196 <summary>Magnifier zoom in</summary>
197 <description>Binding for the magnifier to zoom in</description>
198 </key>
199 <key name="magnifier-zoom-out" type="s">
200 <default>'&lt;Alt&gt;&lt;Super&gt;minus'</default>
201 <summary>Magnifier zoom out</summary>
202 <description>Binding for the magnifier to zoom out</description>
203 </key>
204 <key name="max-screencast-length" type="u">
205 <default>30</default>
206 <summary>Maximum length of screen recordings</summary>
207 <description>The maximum length of single screen cast recordings in seconds or 0 for unlimited</description>
208 </key>
209 </schema>
210
211 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding">
212 <key name="name" type="s">
213 <default>''</default>
214 <summary>Name</summary>
215 <description>Name of the custom binding</description>
216 </key>
217 <key name="binding" type="s">
218 <default>''</default>
219 <summary>Binding</summary>
220 <description>Binding for the custom binding</description>
221 </key>
222 <key name="command" type="s">
223 <default>''</default>
224 <summary>Command</summary>
225 <description>Command to run when the binding is invoked</description>
226 </key>
227 </schema>
228</schemalist>
0229
=== modified file 'debian/control'
--- debian/control 2019-01-09 16:46:14 +0000
+++ debian/control 2019-09-06 22:29:15 +0000
@@ -58,6 +58,7 @@
58 accountsservice (>= 0.6.34),58 accountsservice (>= 0.6.34),
59 gsettings-desktop-schemas (>= 3.15.4),59 gsettings-desktop-schemas (>= 3.15.4),
60 nautilus-data (>= 2.91.3-1),60 nautilus-data (>= 2.91.3-1),
61 unity-settings-daemon-schemas (>= ${source:Version}),
61 gnome-settings-daemon-common (>= 3.16),62 gnome-settings-daemon-common (>= 3.16),
62 gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),63 gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
63Recommends: ibus (>= 1.5.0),64Recommends: ibus (>= 1.5.0),
@@ -103,6 +104,15 @@
103Description: Headers for building applications communicating with unity-settings-daemon104Description: Headers for building applications communicating with unity-settings-daemon
104 This package contains header files required to build applications that105 This package contains header files required to build applications that
105 communicate with the Unity settings daemon over D-Bus.106 communicate with the Unity settings daemon over D-Bus.
107
108Package: unity-settings-daemon-schemas
109Architecture: all
110Depends: ${misc:Depends}
111Replaces: gnome-settings-daemon (<< 3.20.1-2ubuntu1~)
112Breaks: gnome-settings-daemon (<< 3.20.1-2ubuntu1~)
113Description: Shared schemas for gnome-settings-daemon
114 This package contains the gsettings schemas used by
115 unity-settings-daemon.
106116
107Package: libunity-settings-daemon1117Package: libunity-settings-daemon1
108Architecture: any118Architecture: any
109119
=== added file 'debian/unity-settings-daemon-schemas.install'
--- debian/unity-settings-daemon-schemas.install 1970-01-01 00:00:00 +0000
+++ debian/unity-settings-daemon-schemas.install 2019-09-06 22:29:15 +0000
@@ -0,0 +1,1 @@
1debian/*/usr/share/glib-*/schemas/*
02
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c 2016-10-03 09:57:23 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c 2019-09-06 22:29:15 +0000
@@ -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->settings,688 g_settings_set_enum (manager->priv->gsettings,
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->settings;1796 settings = manager->priv->gsettings;
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->settings, KEY_NUMLOCK_STATE);1798 manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE);
17991799
1800 gdk_error_trap_push ();1800 gdk_error_trap_push ();
1801 if (rnumlock) {1801 if (rnumlock) {
@@ -2629,7 +2629,8 @@
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 },
2633 };2634 };
26342635
2635 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",2636 gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",
26362637
=== modified file 'plugins/media-keys/shortcuts-list.h'
--- plugins/media-keys/shortcuts-list.h 2014-03-14 06:27:10 +0000
+++ plugins/media-keys/shortcuts-list.h 2019-09-06 22:29:15 +0000
@@ -24,7 +24,7 @@
24#include "shell-keybinding-modes.h"24#include "shell-keybinding-modes.h"
25#include "gsd-keygrab.h"25#include "gsd-keygrab.h"
2626
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"
28#define INPUT_SETTINGS_BINDING_DIR "org.gnome.desktop.wm.keybindings"28#define INPUT_SETTINGS_BINDING_DIR "org.gnome.desktop.wm.keybindings"
2929
30typedef enum {30typedef enum {
3131
=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c 2015-10-07 16:32:40 +0000
+++ plugins/mouse/gsd-mouse-manager.c 2019-09-06 22:29:15 +0000
@@ -57,7 +57,7 @@
5757
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))
5959
60#define GSD_SETTINGS_MOUSE_SCHEMA "org.gnome.settings-daemon.peripherals.mouse"60#define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface"
61#define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse"61#define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse"
62#define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad"62#define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad"
6363
@@ -82,7 +82,7 @@
82 GSettings *touchpad_settings;82 GSettings *touchpad_settings;
83 GSettings *mouse_settings;83 GSettings *mouse_settings;
84 GSettings *mouse_a11y_settings;84 GSettings *mouse_a11y_settings;
85 GSettings *gsd_mouse_settings;85 GSettings *interface_settings;
86 GdkDeviceManager *device_manager;86 GdkDeviceManager *device_manager;
87 guint device_added_id;87 guint device_added_id;
88 guint device_removed_id;88 guint device_removed_id;
@@ -851,7 +851,7 @@
851 manager->priv->locate_pointer_spawned = (error == NULL);851 manager->priv->locate_pointer_spawned = (error == NULL);
852852
853 if (error) {853 if (error) {
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);
855 g_error_free (error);855 g_error_free (error);
856 }856 }
857857
@@ -1223,8 +1223,8 @@
12231223
1224 set_devicepresence_handler (manager);1224 set_devicepresence_handler (manager);
12251225
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);
1227 g_signal_connect (manager->priv->gsd_mouse_settings, "changed",1227 g_signal_connect (manager->priv->interface_settings, "changed",
1228 G_CALLBACK (mouse_callback), manager);1228 G_CALLBACK (mouse_callback), manager);
12291229
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");
@@ -1241,7 +1241,7 @@
12411241
1242 manager->priv->syndaemon_spawned = FALSE;1242 manager->priv->syndaemon_spawned = FALSE;
12431243
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));
1245 set_mousetweaks_daemon (manager,1245 set_mousetweaks_daemon (manager,
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),
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));
@@ -1326,6 +1326,8 @@
1326 g_clear_object (&p->touchpad_settings);1326 g_clear_object (&p->touchpad_settings);
13271327
1328 set_locate_pointer (manager, FALSE);1328 set_locate_pointer (manager, FALSE);
1329
1330 g_clear_object (&p->interface_settings);
1329}1331}
13301332
1331static void1333static void

Subscribers

People subscribed via source and target branches