Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-control-center/use-usd-schemas into
lp:unity-control-center.
Commit message:
* Port media keys to use com.canonical.unity.settings-daemon. LP: #1842324
* Update version number to 19.10
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/use-usd-schemas/+merge/372174
--
Your team Unity Control Center development team is subscribed to branch
lp:unity-control-center.
=== modified file 'debian/rules'
--- debian/rules 2019-03-01 16:13:07 +0000
+++ debian/rules 2019-09-02 23:43:07 +0000
@@ -18,6 +18,6 @@
DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
binary-post-install/unity-control-center::
- ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 19.04" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
+ ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 19.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
common-binary-post-install-arch:: list-missing
=== modified file 'panels/keyboard/00-multimedia.xml.in'
--- panels/keyboard/00-multimedia.xml.in 2011-02-16 18:00:38 +0000
+++ panels/keyboard/00-multimedia.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Sound and Media">
+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Sound and Media">
<KeyListEntry name="volume-mute" _description="Volume mute"/>
=== modified file 'panels/keyboard/01-launchers.xml.in'
--- panels/keyboard/01-launchers.xml.in 2013-11-28 04:38:37 +0000
+++ panels/keyboard/01-launchers.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Launchers">
+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Launchers">
<KeyListEntry name="help" _description="Launch help browser"/>
=== modified file 'panels/keyboard/01-screenshot.xml.in'
--- panels/keyboard/01-screenshot.xml.in 2013-11-28 06:01:16 +0000
+++ panels/keyboard/01-screenshot.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Screenshots">
+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Screenshots">
<KeyListEntry name="screenshot"
_description="Take a screenshot"/>
=== modified file 'panels/keyboard/01-system.xml.in'
--- panels/keyboard/01-system.xml.in 2011-02-16 18:00:38 +0000
+++ panels/keyboard/01-system.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="System">
+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="System">
<KeyListEntry name="logout" _description="Log out"/>
=== modified file 'panels/keyboard/50-accessibility.xml.in'
--- panels/keyboard/50-accessibility.xml.in 2011-11-09 00:04:50 +0000
+++ panels/keyboard/50-accessibility.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries group="system" _name="Universal Access" schema="org.gnome.settings-daemon.plugins.media-keys">
+<KeyListEntries group="system" _name="Universal Access" schema="com.canonical.unity.settings-daemon.plugins.media-keys">
<KeyListEntry name="magnifier" _description="Turn zoom on or off"/>
=== modified file 'panels/keyboard/cc-keyboard-item.c'
--- panels/keyboard/cc-keyboard-item.c 2013-11-28 04:33:09 +0000
+++ panels/keyboard/cc-keyboard-item.c 2019-09-02 23:43:07 +0000
@@ -31,7 +31,7 @@
#define CC_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_ITEM, CcKeyboardItemPrivate))
-#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
+#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
struct CcKeyboardItemPrivate
{
=== modified file 'panels/keyboard/keyboard-shortcuts.c'
--- panels/keyboard/keyboard-shortcuts.c 2014-03-14 14:43:48 +0000
+++ panels/keyboard/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
@@ -28,8 +28,8 @@
#include "cc-keyboard-option.h"
#include "wm-common.h"
-#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"
-#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
+#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
+#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
#define CUSTOM_SHORTCUTS_ID "custom"
#define WID(builder, name) (GTK_WIDGET (gtk_builder_get_object (builder, name)))
=== modified file 'panels/region/cc-region-keyboard-item.c'
--- panels/region/cc-region-keyboard-item.c 2013-11-28 06:02:43 +0000
+++ panels/region/cc-region-keyboard-item.c 2019-09-02 23:43:07 +0000
@@ -31,7 +31,7 @@
#define CC_REGION_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_KEYBOARD_ITEM, CcRegionKeyboardItemPrivate))
-#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
+#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
struct CcRegionKeyboardItemPrivate
{
=== modified file 'panels/region/keyboard-shortcuts.c'
--- panels/region/keyboard-shortcuts.c 2013-11-29 06:28:37 +0000
+++ panels/region/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
@@ -26,8 +26,8 @@
#include "keyboard-shortcuts.h"
#include "wm-common.h"
-#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"
-#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
+#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
+#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
#define CUSTOM_SHORTCUTS_ID "custom"
typedef struct {
=== modified file 'panels/universal-access/cc-ua-panel.c'
--- panels/universal-access/cc-ua-panel.c 2016-10-03 03:43:05 +0000
+++ panels/universal-access/cc-ua-panel.c 2019-09-02 23:43:07 +0000
@@ -716,7 +716,7 @@
priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");
- priv->mediakeys_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
+ priv->mediakeys_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
priv->a11y_profile_settings = g_settings_new ("org.gnome.desktop.a11y");
priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
