Unity Settings Daemon

Merge lp:~khurshid-alam/unity-settings-daemon/gds-to-gus-impish into lp:unity-settings-daemon

  1. gds-to-gus-impish
  2. Merge into trunk
Proposed by Khurshid Alam
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4206
Merged at revision: 4206
Proposed branch: lp:~khurshid-alam/unity-settings-daemon/gds-to-gus-impish
Merge into: lp:unity-settings-daemon
Diff against target: 293 lines (+48/-22)
7 files modified
configure.ac (+4/-0)
data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in (+8/-5)
debian/control (+2/-1)
gnome-settings-daemon/gsd-bg.c (+6/-2)
plugins/background/gsd-background-manager.c (+15/-2)
plugins/mouse/gsd-mouse-manager.c (+12/-6)
plugins/xsettings/gsd-xsettings-manager.c (+1/-6)
To merge this branch: bzr merge lp:~khurshid-alam/unity-settings-daemon/gds-to-gus-impish
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+405683@code.launchpad.net

Commit message

* Touchpad scroll-method was migrated before from u-s-d to gesetting-desktop-schemas. Now that gsettings-desktop-schemas removed that schema, port it back under unity-settings-daemon schemas

* Make build depends on gsettings-unity-schemas-dev >=0.0.7+21.10.20210712-0ubuntu1

* Use draw-background key from gsettings-ubuntu-schemas.

* Remove legacy desktop interface schema from xsettings translations entry. See https://salsa.debian.org/gnome-team/gsettings-desktop-schemas/-/commit/82d78fbcc800cac5cca11e9a146a1ea2d6388165

LP: #1933646

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

the changes make sense indeed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2020-02-23 15:03:25 +0000
3+++ configure.ac 2021-07-14 10:31:29 +0000
4@@ -57,6 +57,7 @@
5 UPOWER_REQUIRED_VERSION=0.9.11
6 IBUS_REQUIRED_VERSION=1.4.99
7 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.7.2.1
8+GSETTINGS_UNITY_SCHEMAS_REQUIRED_VERSION=0.0.1
9 XRANDR_REQUIRED_VERSION=1.3
10 XEXT_REQUIRED_VERSION=1.1
11 NM_REQUIRED_VERSION=1.0
12@@ -69,6 +70,7 @@
13 gmodule-2.0
14 gthread-2.0
15 gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
16+ gsettings-unity-schemas >= $GSETTINGS_UNITY_SCHEMAS_REQUIRED_VERSION
17 )
18
19 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
20@@ -76,6 +78,7 @@
21 gio-2.0 >= $GIO_REQUIRED_VERSION
22 libnotify >= $LIBNOTIFY_REQUIRED_VERSION
23 gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
24+ gsettings-unity-schemas >= $GSETTINGS_UNITY_SCHEMAS_REQUIRED_VERSION
25 x11
26 )
27
28@@ -154,6 +157,7 @@
29 gio-2.0 >= $GIO_REQUIRED_VERSION
30 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
31 gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
32+ gsettings-unity-schemas >= $GSETTINGS_UNITY_SCHEMAS_REQUIRED_VERSION
33 gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
34 xrandr >= $XRANDR_REQUIRED_VERSION
35 xext >= $XEXT_REQUIRED_VERSION
36
37=== modified file 'data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in'
38--- data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 2020-03-06 20:22:12 +0000
39+++ data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in 2021-07-14 10:31:29 +0000
40@@ -14,6 +14,7 @@
41 <child name="smartcard" schema="com.canonical.unity.settings-daemon.peripherals.smartcard"/>
42 <child name="keyboard" schema="com.canonical.unity.settings-daemon.peripherals.keyboard"/>
43 <child name="mouse" schema="com.canonical.unity.settings-daemon.peripherals.mouse"/>
44+ <child name="touchpad" schema="com.canonical.unity.settings-daemon.peripherals.touchpad"/>
45 <child name="touchscreen" schema="com.canonical.unity.settings-daemon.peripherals.touchscreen"/>
46 <child name="input-devices" schema="com.canonical.unity.settings-daemon.peripherals.input-devices"/>
47 </schema>
48@@ -73,6 +74,13 @@
49 <description>Distance before a drag is started.</description>
50 </key>
51 </schema>
52+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.touchpad" path="/com/canonical/unity/settings-daemon/peripherals/touchpad/">
53+ <key name="scroll-method" enum="com.canonical.unity.settings-daemon.GsdTouchpadScrollMethod">
54+ <default>'two-finger-scrolling'</default>
55+ <summary>Select the touchpad scroll method</summary>
56+ <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”, “two-finger-scrolling”.</description>
57+ </key>
58+ </schema>
59 <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.peripherals.touchscreen" path="/com/canonical/unity/settings-daemon/peripherals/touchscreen/">
60 <key name="orientation-lock" type="b">
61 <default>false</default>
62@@ -136,11 +144,6 @@
63 <summary>Enable horizontal scrolling</summary>
64 <description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</description>
65 </key>
66- <key name="scroll-method" enum="com.canonical.unity.settings-daemon.GsdTouchpadScrollMethod">
67- <default>'two-finger-scrolling'</default>
68- <summary>Select the touchpad scroll method</summary>
69- <description>Select the touchpad scroll method. Supported values are: “disabled”, “edge-scrolling”, “two-finger-scrolling”.</description>
70- </key>
71 <key name="tap-to-click" type="b">
72 <default>false</default>
73 <summary>Enable mouse clicks with touchpad</summary>
74
75=== modified file 'debian/control'
76--- debian/control 2020-03-06 20:22:12 +0000
77+++ debian/control 2021-07-14 10:31:29 +0000
78@@ -23,6 +23,7 @@
79 libx11-dev,
80 libxtst-dev,
81 gsettings-desktop-schemas-dev (>= 3.15.4),
82+ gsettings-unity-schemas-dev (>= 0.0.7+21.10.20210712-0ubuntu1),
83 libgnome-desktop-3-dev (>= 3.7.90),
84 libpulse-dev (>= 1:2.0),
85 libasound2-dev,
86@@ -58,9 +59,9 @@
87 ${misc:Depends},
88 accountsservice (>= 0.6.34),
89 gsettings-desktop-schemas (>= 3.15.4),
90+ gsettings-ubuntu-schemas (>= 0.0.7+21.10.20210712-0ubuntu1),
91 nautilus-data (>= 2.91.3-1),
92 unity-settings-daemon-schemas (>= ${source:Version}),
93- gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
94 Recommends: ibus (>= 1.5.0),
95 pulseaudio,
96 systemd-services
97
98=== modified file 'gnome-settings-daemon/gsd-bg.c'
99--- gnome-settings-daemon/gsd-bg.c 2020-02-23 15:03:25 +0000
100+++ gnome-settings-daemon/gsd-bg.c 2021-07-14 10:31:29 +0000
101@@ -320,7 +320,7 @@
102 g_return_if_fail (GSD_IS_BG (bg));
103 g_return_if_fail (G_IS_SETTINGS (settings));
104
105- background_settings = g_settings_new ("org.gnome.desktop.background");
106+ background_settings = g_settings_new ("com.canonical.unity.desktop.background");
107 bg->is_enabled = g_settings_get_boolean (background_settings, BG_KEY_DRAW_BACKGROUND);
108 g_object_unref (background_settings);
109
110@@ -357,6 +357,8 @@
111 gchar *secondary;
112 gchar *uri;
113
114+ GSettings *background_settings;
115+
116 g_return_if_fail (GSD_IS_BG (bg));
117 g_return_if_fail (G_IS_SETTINGS (settings));
118
119@@ -370,7 +372,9 @@
120 uri = g_filename_to_uri (bg->filename, NULL, NULL);
121 if (uri == NULL)
122 uri = g_strdup ("");
123- g_settings_set_boolean (settings, BG_KEY_DRAW_BACKGROUND, bg->is_enabled);
124+ background_settings = g_settings_new ("com.canonical.unity.desktop.background");
125+ g_settings_set_boolean (background_settings, BG_KEY_DRAW_BACKGROUND, bg->is_enabled);
126+ g_object_unref (background_settings);
127 g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri);
128 g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, primary);
129 g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, secondary);
130
131=== modified file 'plugins/background/gsd-background-manager.c'
132--- plugins/background/gsd-background-manager.c 2020-02-23 15:03:25 +0000
133+++ plugins/background/gsd-background-manager.c 2021-07-14 10:31:29 +0000
134@@ -50,6 +50,7 @@
135 struct GsdBackgroundManagerPrivate
136 {
137 GSettings *settings;
138+ GSettings *usettings;
139 GsdBG *bg;
140
141 GsdBGCrossfade *fade;
142@@ -72,7 +73,7 @@
143 static gboolean
144 dont_draw_background (GsdBackgroundManager *manager)
145 {
146- return !g_settings_get_boolean (manager->priv->settings,
147+ return !g_settings_get_boolean (manager->priv->usettings,
148 "draw-background");
149 }
150
151@@ -497,8 +498,11 @@
152 gnome_settings_profile_start (NULL);
153
154 manager->priv->settings = g_settings_new ("org.gnome.desktop.background");
155- g_signal_connect (manager->priv->settings, "changed::draw-background",
156+ manager->priv->usettings = g_settings_new ("com.canonical.unity.desktop.background");
157+
158+ g_signal_connect (manager->priv->usettings, "changed::draw-background",
159 G_CALLBACK (draw_background_changed), manager);
160+
161 g_signal_connect (manager->priv->settings, "changed::picture-uri",
162 G_CALLBACK (picture_uri_changed), manager);
163
164@@ -541,11 +545,20 @@
165 settings_change_event_cb,
166 manager);
167
168+ g_signal_handlers_disconnect_by_func (manager->priv->usettings,
169+ settings_change_event_cb,
170+ manager);
171+
172 if (p->settings != NULL) {
173 g_object_unref (p->settings);
174 p->settings = NULL;
175 }
176
177+ if (p->usettings != NULL) {
178+ g_object_unref (p->usettings);
179+ p->usettings = NULL;
180+ }
181+
182 if (p->bg != NULL) {
183 g_object_unref (p->bg);
184 p->bg = NULL;
185
186=== modified file 'plugins/mouse/gsd-mouse-manager.c'
187--- plugins/mouse/gsd-mouse-manager.c 2020-03-06 20:22:12 +0000
188+++ plugins/mouse/gsd-mouse-manager.c 2021-07-14 10:31:29 +0000
189@@ -60,6 +60,7 @@
190 #define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface"
191 #define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse"
192 #define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad"
193+#define USD_TOUCHPAD_SCHEMA "com.canonical.unity.settings-daemon.peripherals.touchpad"
194
195 /* Keys for both touchpad and mouse */
196 #define KEY_LEFT_HANDED "left-handed" /* a boolean for mouse, an enum for touchpad */
197@@ -80,6 +81,7 @@
198 {
199 guint start_idle_id;
200 GSettings *touchpad_settings;
201+ GSettings *usd_touchpad_settings;
202 GSettings *mouse_settings;
203 GSettings *mouse_a11y_settings;
204 GSettings *interface_settings;
205@@ -737,7 +739,7 @@
206 if (!(data[3]) && method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING) {
207 g_warning ("Two finger scroll is not supported by %s", gdk_device_get_name (device));
208 method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
209- g_settings_set_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD, method);
210+ g_settings_set_enum (manager->priv->usd_touchpad_settings, KEY_SCROLL_METHOD, method);
211 }
212
213 XFree (data);
214@@ -954,7 +956,7 @@
215 set_motion (manager, device);
216
217 set_tap_to_click (device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TAP_TO_CLICK), touchpad_left_handed);
218- set_scroll_method (manager, device, g_settings_get_enum (manager->priv->touchpad_settings, KEY_SCROLL_METHOD));
219+ set_scroll_method (manager, device, g_settings_get_enum (manager->priv->usd_touchpad_settings, KEY_SCROLL_METHOD));
220 set_horiz_scroll (device, TRUE);
221 set_natural_scroll (manager, device, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_NATURAL_SCROLL_ENABLED));
222 if (!get_touchpad_enabled (manager))
223@@ -1077,10 +1079,10 @@
224 if (g_str_equal (key, KEY_TAP_TO_CLICK)) {
225 gboolean mouse_left_handed;
226 mouse_left_handed = g_settings_get_boolean (manager->priv->mouse_settings, KEY_LEFT_HANDED);
227- set_tap_to_click (device, g_settings_get_boolean (settings, key),
228+ set_tap_to_click (device, g_settings_get_boolean (manager->priv->touchpad_settings, key),
229 get_touchpad_handedness (manager, mouse_left_handed));
230 } else if (g_str_equal (key, KEY_SCROLL_METHOD)) {
231- set_scroll_method (manager, device, g_settings_get_enum (settings, key));
232+ set_scroll_method (manager, device, g_settings_get_enum (manager->priv->usd_touchpad_settings, key));
233 set_horiz_scroll (device, TRUE);
234 } else if (g_str_equal (key, KEY_SEND_EVENTS)) {
235 if (!get_touchpad_enabled (manager))
236@@ -1094,7 +1096,7 @@
237 mouse_left_handed = g_settings_get_boolean (manager->priv->mouse_settings, KEY_LEFT_HANDED);
238 set_left_handed (manager, device, mouse_left_handed, get_touchpad_handedness (manager, mouse_left_handed));
239 } else if (g_str_equal (key, KEY_NATURAL_SCROLL_ENABLED)) {
240- set_natural_scroll (manager, device, g_settings_get_boolean (settings, key));
241+ set_natural_scroll (manager, device, g_settings_get_boolean (manager->priv->touchpad_settings, key));
242 }
243 }
244 g_list_free (devices);
245@@ -1239,6 +1241,10 @@
246 g_signal_connect (manager->priv->touchpad_settings, "changed",
247 G_CALLBACK (touchpad_callback), manager);
248
249+ manager->priv->usd_touchpad_settings = g_settings_new (USD_TOUCHPAD_SCHEMA);
250+ g_signal_connect (manager->priv->usd_touchpad_settings, "changed",
251+ G_CALLBACK (touchpad_callback), manager);
252+
253 manager->priv->syndaemon_spawned = FALSE;
254
255 set_locate_pointer (manager, g_settings_get_boolean (manager->priv->interface_settings, KEY_LOCATE_POINTER));
256@@ -1324,6 +1330,7 @@
257 g_clear_object (&p->mouse_a11y_settings);
258 g_clear_object (&p->mouse_settings);
259 g_clear_object (&p->touchpad_settings);
260+ g_clear_object (&p->usd_touchpad_settings);
261
262 set_locate_pointer (manager, FALSE);
263
264@@ -1392,7 +1399,6 @@
265 GsdSettingsMigrateEntry touchpad_entries[] = {
266 { "disable-while-typing", NULL, NULL },
267 { "horiz-scroll-enabled", NULL, NULL },
268- { "scroll-method", "scroll-method", NULL },
269 { "tap-to-click", "tap-to-click", NULL },
270 { "touchpad-enabled", "send-events", map_send_events },
271 { "left-handed", "left-handed", NULL },
272
273=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
274--- plugins/xsettings/gsd-xsettings-manager.c 2020-03-06 20:22:12 +0000
275+++ plugins/xsettings/gsd-xsettings-manager.c 2021-07-14 10:31:29 +0000
276@@ -387,16 +387,11 @@
277 { "org.gnome.desktop.interface", "gtk-im-status-style", "Gtk/IMStatusStyle", translate_string_string },
278 { "org.gnome.desktop.interface", "gtk-im-module", "Gtk/IMModule", translate_string_string },
279 { "org.gnome.desktop.interface", "icon-theme", "Net/IconThemeName", translate_string_string },
280- { "org.gnome.desktop.interface", "menus-have-icons", "Gtk/MenuImages", translate_bool_int },
281- { "org.gnome.desktop.interface", "buttons-have-icons", "Gtk/ButtonImages", translate_bool_int },
282 { "org.gnome.desktop.interface", "menubar-accel", "Gtk/MenuBarAccel", translate_string_string },
283 { "org.gnome.desktop.interface", "enable-animations", "Gtk/EnableAnimations", translate_bool_int },
284 { "org.gnome.desktop.interface", "cursor-theme", "Gtk/CursorThemeName", translate_string_string },
285+
286 /* cursor-size is handled via the Xft side as it needs the scaling factor */
287- { "org.gnome.desktop.interface", "show-input-method-menu", "Gtk/ShowInputMethodMenu", translate_bool_int },
288- { "org.gnome.desktop.interface", "show-unicode-menu", "Gtk/ShowUnicodeMenu", translate_bool_int },
289- { "org.gnome.desktop.interface", "automatic-mnemonics", "Gtk/AutoMnemonics", translate_bool_int },
290-
291 { "org.gnome.desktop.sound", "theme-name", "Net/SoundThemeName", translate_string_string },
292 { "org.gnome.desktop.sound", "event-sounds", "Net/EnableEventSounds" , translate_bool_int },
293 { "org.gnome.desktop.sound", "input-feedback-sounds", "Net/EnableInputFeedbackSounds", translate_bool_int },

Subscribers

People subscribed via source and target branches