Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-control-center/usd-schemas-focal into
lp:unity-control-center.
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
Requested reviews:
Sebastien Bacher (seb128)
Related bugs:
Bug #1842324 in unity-settings-daemon (Ubuntu): "Port schemas from
gnome-settings-daemon-common to com.canonical.unity.settings-daemon"
https://bugs.launchpad.net/ubuntu/+source/unity-settings-daemon/+bug/1842324
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-control-center/usd-schemas-focal/+merge/380371
--
Your team Unity Control Center development team is subscribed to branch
lp:unity-control-center.
=== modified file 'debian/control'
--- debian/control 2019-05-01 13:16:51 +0000
+++ debian/control 2020-03-06 18:46:24 +0000
@@ -11,7 +11,7 @@
gtk-doc-tools,
gnome-common,
gnome-pkg-tools (>= 0.10),
- unity-settings-daemon-dev,
+ unity-settings-daemon-dev (>= 15.04.1+19.10.20190921-0ubuntu3),
libunity-settings-daemon-dev,
gsettings-desktop-schemas-dev (>= 3.15.4),
intltool (>= 0.37.1),
@@ -75,8 +75,8 @@
adwaita-icon-theme,
gnome-menus (>= 2.12.0),
gnome-online-accounts,
- unity-settings-daemon,
- gnome-settings-daemon-common (>= 3.16),
+ unity-settings-daemon (>= 15.04.1+19.10.20190921-0ubuntu3),
+ unity-settings-daemon-schemas (>= 15.04.1+19.10.20190921-0ubuntu3),
gsettings-desktop-schemas (>= 3.15.4),
gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
ibus,
=== modified file 'panels/color/cc-color-panel.c'
--- panels/color/cc-color-panel.c 2016-03-09 21:59:10 +0000
+++ panels/color/cc-color-panel.c 2020-03-06 18:46:24 +0000
@@ -76,7 +76,7 @@
GCM_PREFS_ENTRY_TYPE_IMPORT
} GcmPrefsEntryType;
-#define GCM_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.color"
+#define GCM_SETTINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.color"
#define GCM_SETTINGS_RECALIBRATE_PRINTER_THRESHOLD "recalibrate-printer-threshold"
#define GCM_SETTINGS_RECALIBRATE_DISPLAY_THRESHOLD "recalibrate-display-threshold"
=== modified file 'panels/mouse/gnome-mouse-properties.c'
--- panels/mouse/gnome-mouse-properties.c 2015-07-19 03:31:23 +0000
+++ panels/mouse/gnome-mouse-properties.c 2020-03-06 18:46:24 +0000
@@ -295,7 +295,7 @@
{
mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
- gsd_mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
+ gsd_mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
=== modified file 'panels/mouse/gnome-mouse-test.c'
--- panels/mouse/gnome-mouse-test.c 2014-02-07 16:40:25 +0000
+++ panels/mouse/gnome-mouse-test.c 2020-03-06 18:46:24 +0000
@@ -338,7 +338,7 @@
GtkWidget *
gnome_mouse_test_init (GtkBuilder *dialog)
{
- mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
+ mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
setup_dialog (dialog);
=== modified file 'panels/mouse/gsd-input-helper.c'
--- panels/mouse/gsd-input-helper.c 2012-08-20 17:33:28 +0000
+++ panels/mouse/gsd-input-helper.c 2020-03-06 18:46:24 +0000
@@ -29,7 +29,7 @@
#include "gsd-input-helper.h"
-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.peripherals.input-devices"
#define KEY_HOTPLUG_COMMAND "hotplug-command"
typedef gboolean (* InfoIdentifyFunc) (XDeviceInfo *device_info);
=== modified file 'panels/power/cc-power-panel.c'
--- panels/power/cc-power-panel.c 2016-07-06 15:05:34 +0000
+++ panels/power/cc-power-panel.c 2020-03-06 18:46:24 +0000
@@ -1069,7 +1069,7 @@
self->priv->up_client = up_client_new ();
set_ac_battery_ui_mode (self);
- self->priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
+ self->priv->gsd_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.power");
g_signal_connect (self->priv->gsd_settings,
"changed",
G_CALLBACK (on_lock_settings_changed),
=== modified file 'panels/screen/cc-screen-panel.c'
--- panels/screen/cc-screen-panel.c 2016-03-15 20:34:23 +0000
+++ panels/screen/cc-screen-panel.c 2020-03-06 18:46:24 +0000
@@ -495,7 +495,7 @@
"changed",
G_CALLBACK (on_lock_settings_changed),
self);
- self->priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
+ self->priv->gsd_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.power");
self->priv->session_settings = g_settings_new ("org.gnome.desktop.session");
self->priv->lockdown_settings = g_settings_new ("org.gnome.desktop.lockdown");
g_signal_connect (self->priv->lockdown_settings,
=== modified file 'panels/wacom/gsd-input-helper.c'
--- panels/wacom/gsd-input-helper.c 2014-02-19 02:24:52 +0000
+++ panels/wacom/gsd-input-helper.c 2020-03-06 18:46:24 +0000
@@ -31,7 +31,7 @@
#include "gsd-input-helper.h"
-#define INPUT_DEVICES_SCHEMA "org.gnome.settings-daemon.peripherals.input-devices"
+#define INPUT_DEVICES_SCHEMA "com.canonical.unity.settings-daemon.plugins.peripherals.input-devices"
#define KEY_HOTPLUG_COMMAND "hotplug-command"
typedef gboolean (* InfoIdentifyFunc) (XDeviceInfo *device_info);
=== modified file 'panels/wacom/gsd-wacom-device.c'
--- panels/wacom/gsd-wacom-device.c 2014-08-29 10:26:05 +0000
+++ panels/wacom/gsd-wacom-device.c 2020-03-06 18:46:24 +0000
@@ -40,11 +40,11 @@
#define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
-#define WACOM_TABLET_SCHEMA "org.gnome.settings-daemon.peripherals.wacom"
-#define WACOM_DEVICE_CONFIG_BASE "/org/gnome/settings-daemon/peripherals/wacom/%s-%s/"
-#define WACOM_STYLUS_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.stylus"
-#define WACOM_ERASER_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.eraser"
-#define WACOM_BUTTON_SCHEMA "org.gnome.settings-daemon.peripherals.wacom.tablet-button"
+#define WACOM_TABLET_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom"
+#define WACOM_DEVICE_CONFIG_BASE "/com/canonical/unity/settings-daemon/peripherals/wacom/%s-%s/"
+#define WACOM_STYLUS_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.stylus"
+#define WACOM_ERASER_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.eraser"
+#define WACOM_BUTTON_SCHEMA "com.canonical.unity.settings-daemon.peripherals.wacom.tablet-button"
static struct {
GsdRRRotation rotation;
@@ -316,7 +316,7 @@
* Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
* Tool-specific settings: applied to one tool only.
*/
-#define SETTINGS_WACOM_DIR "org.gnome.settings-daemon.peripherals.wacom"
+#define SETTINGS_WACOM_DIR "com.canonical.unity.settings-daemon.peripherals.wacom"
#define SETTINGS_STYLUS_DIR "stylus"
#define SETTINGS_ERASER_DIR "eraser"
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
