Merge lp:~khurshid-alam/unity-control-center/usd-schemas-focal into lp:unity-control-center

Proposed by Khurshid Alam on 2020-03-06
Status: Merged
Approved by: Sebastien Bacher on 2020-03-11
Approved revision: 12928
Merged at revision: 12927
Proposed branch: lp:~khurshid-alam/unity-control-center/usd-schemas-focal
Merge into: lp:unity-control-center
Diff against target: 143 lines (+16/-16)
9 files modified
debian/control (+3/-3)
panels/color/cc-color-panel.c (+1/-1)
panels/mouse/gnome-mouse-properties.c (+1/-1)
panels/mouse/gnome-mouse-test.c (+1/-1)
panels/mouse/gsd-input-helper.c (+1/-1)
panels/power/cc-power-panel.c (+1/-1)
panels/screen/cc-screen-panel.c (+1/-1)
panels/wacom/gsd-input-helper.c (+1/-1)
panels/wacom/gsd-wacom-device.c (+6/-6)
To merge this branch: bzr merge lp:~khurshid-alam/unity-control-center/usd-schemas-focal
Reviewer Review Type Date Requested Status
Sebastien Bacher 2020-03-06 Approve on 2020-03-11
Review via email: mp+380371@code.launchpad.net

Commit message

* Port rest of the schemas gnome-settings-daemon-common to com.canonical.unity.settings-daemon. LP: #1842324

* Bump dependency of unity-settings-daemon & unity-settings-daemon-schemas

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2019-05-01 13:16:51 +0000
3+++ debian/control 2020-03-06 18:46:24 +0000
4@@ -11,7 +11,7 @@
5 gtk-doc-tools,
6 gnome-common,
7 gnome-pkg-tools (>= 0.10),
8- unity-settings-daemon-dev,
9+ unity-settings-daemon-dev (>= 15.04.1+19.10.20190921-0ubuntu3),
10 libunity-settings-daemon-dev,
11 gsettings-desktop-schemas-dev (>= 3.15.4),
12 intltool (>= 0.37.1),
13@@ -75,8 +75,8 @@
14 adwaita-icon-theme,
15 gnome-menus (>= 2.12.0),
16 gnome-online-accounts,
17- unity-settings-daemon,
18- gnome-settings-daemon-common (>= 3.16),
19+ unity-settings-daemon (>= 15.04.1+19.10.20190921-0ubuntu3),
20+ unity-settings-daemon-schemas (>= 15.04.1+19.10.20190921-0ubuntu3),
21 gsettings-desktop-schemas (>= 3.15.4),
22 gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
23 ibus,
24
25=== modified file 'panels/color/cc-color-panel.c'
26--- panels/color/cc-color-panel.c 2016-03-09 21:59:10 +0000
27+++ panels/color/cc-color-panel.c 2020-03-06 18:46:24 +0000
28@@ -76,7 +76,7 @@
29 GCM_PREFS_ENTRY_TYPE_IMPORT
30 } GcmPrefsEntryType;
31
32-#define GCM_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.color"
33+#define GCM_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.color"
34 #define GCM_SETTINGS_RECALIBRATE_PRINTER_THRESHOLD "recalibrate-printer-threshold"
35 #define GCM_SETTINGS_RECALIBRATE_DISPLAY_THRESHOLD "recalibrate-display-threshold"
36
37
38=== modified file 'panels/mouse/gnome-mouse-properties.c'
39--- panels/mouse/gnome-mouse-properties.c 2015-07-19 03:31:23 +0000
40+++ panels/mouse/gnome-mouse-properties.c 2020-03-06 18:46:24 +0000
41@@ -295,7 +295,7 @@
42 {
43
44 mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
45- gsd_mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
46+ gsd_mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
47 touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
48
49 device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
50
51=== modified file 'panels/mouse/gnome-mouse-test.c'
52--- panels/mouse/gnome-mouse-test.c 2014-02-07 16:40:25 +0000
53+++ panels/mouse/gnome-mouse-test.c 2020-03-06 18:46:24 +0000
54@@ -338,7 +338,7 @@
55 GtkWidget *
56 gnome_mouse_test_init (GtkBuilder *dialog)
57 {
58- mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
59+ mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
60
61 setup_dialog (dialog);
62
63
64=== modified file 'panels/mouse/gsd-input-helper.c'
65--- panels/mouse/gsd-input-helper.c 2012-08-20 17:33:28 +0000
66+++ panels/mouse/gsd-input-helper.c 2020-03-06 18:46:24 +0000
67@@ -29,7 +29,7 @@
68
69 #include "gsd-input-helper.h"
70
71-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
72+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.peripherals.input-devices"
73 #define KEY_HOTPLUG_COMMAND "hotplug-command"
74
75 typedef gboolean (* InfoIdentifyFunc) (XDeviceInfo *device_info);
76
77=== modified file 'panels/power/cc-power-panel.c'
78--- panels/power/cc-power-panel.c 2016-07-06 15:05:34 +0000
79+++ panels/power/cc-power-panel.c 2020-03-06 18:46:24 +0000
80@@ -1069,7 +1069,7 @@
81 self->priv->up_client = up_client_new ();
82 set_ac_battery_ui_mode (self);
83
84- self->priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
85+ self->priv->gsd_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.power");
86 g_signal_connect (self->priv->gsd_settings,
87 "changed",
88 G_CALLBACK (on_lock_settings_changed),
89
90=== modified file 'panels/screen/cc-screen-panel.c'
91--- panels/screen/cc-screen-panel.c 2016-03-15 20:34:23 +0000
92+++ panels/screen/cc-screen-panel.c 2020-03-06 18:46:24 +0000
93@@ -495,7 +495,7 @@
94 "changed",
95 G_CALLBACK (on_lock_settings_changed),
96 self);
97- self->priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
98+ self->priv->gsd_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.power");
99 self->priv->session_settings = g_settings_new ("org.gnome.desktop.session");
100 self->priv->lockdown_settings = g_settings_new ("org.gnome.desktop.lockdown");
101 g_signal_connect (self->priv->lockdown_settings,
102
103=== modified file 'panels/wacom/gsd-input-helper.c'
104--- panels/wacom/gsd-input-helper.c 2014-02-19 02:24:52 +0000
105+++ panels/wacom/gsd-input-helper.c 2020-03-06 18:46:24 +0000
106@@ -31,7 +31,7 @@
107
108 #include "gsd-input-helper.h"
109
110-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
111+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.plugins.peripherals.input-devices"
112 #define KEY_HOTPLUG_COMMAND "hotplug-command"
113
114 typedef gboolean (* InfoIdentifyFunc) (XDeviceInfo *device_info);
115
116=== modified file 'panels/wacom/gsd-wacom-device.c'
117--- panels/wacom/gsd-wacom-device.c 2014-08-29 10:26:05 +0000
118+++ panels/wacom/gsd-wacom-device.c 2020-03-06 18:46:24 +0000
119@@ -40,11 +40,11 @@
120
121 #define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
122
123-#define WACOM_TABLET_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
124-#define WACOM_DEVICE_CONFIG_BASE "/org/gnome/settings-daemon/peripherals/wacom/%s-%s/"
125-#define WACOM_STYLUS_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.stylus"
126-#define WACOM_ERASER_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.eraser"
127-#define WACOM_BUTTON_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.tablet-button"
128+#define WACOM_TABLET_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom"
129+#define WACOM_DEVICE_CONFIG_BASE "/com/canonical/unity/settings-daemon/peripherals/wacom/%s-%s/"
130+#define WACOM_STYLUS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.stylus"
131+#define WACOM_ERASER_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.eraser"
132+#define WACOM_BUTTON_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button"
133
134 static struct {
135 GsdRRRotation rotation;
136@@ -316,7 +316,7 @@
137 * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
138 * Tool-specific settings: applied to one tool only.
139 */
140-#define SETTINGS_WACOM_DIR "org.gnome.settings-daemon.peripherals.wacom"
141+#define SETTINGS_WACOM_DIR "com.canonical.unity.settings-daemon.peripherals.wacom"
142 #define SETTINGS_STYLUS_DIR "stylus"
143 #define SETTINGS_ERASER_DIR "eraser"
144

Subscribers

People subscribed via source and target branches