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

Proposed by Khurshid Alam on 2019-09-02
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2019-09-21
Approved revision: 12924
Merged at revision: 12923
Proposed branch: lp:~khurshid-alam/unity-control-center/use-usd-schemas
Merge into: lp:unity-control-center
Diff against target: 134 lines (+13/-13)
11 files modified
debian/rules (+1/-1)
panels/keyboard/00-multimedia.xml.in (+1/-1)
panels/keyboard/01-launchers.xml.in (+1/-1)
panels/keyboard/01-screenshot.xml.in (+1/-1)
panels/keyboard/01-system.xml.in (+1/-1)
panels/keyboard/50-accessibility.xml.in (+1/-1)
panels/keyboard/cc-keyboard-item.c (+1/-1)
panels/keyboard/keyboard-shortcuts.c (+2/-2)
panels/region/cc-region-keyboard-item.c (+1/-1)
panels/region/keyboard-shortcuts.c (+2/-2)
panels/universal-access/cc-ua-panel.c (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/unity-control-center/use-usd-schemas
Reviewer Review Type Date Requested Status
Sebastien Bacher 2019-09-02 Approve on 2019-09-21
Marco Trevisan (Treviño) Approve on 2019-09-06
Review via email: mp+372174@code.launchpad.net

Commit message

* Port media keys to use com.canonical.unity.settings-daemon. LP: #1842324

* Update version number to 19.10

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

All good

review: Approve
Sebastien Bacher (seb128) wrote :

Don't you need to update the packaging to depends on unity-settings-daemon-schemas?

review: Needs Information
Khurshid Alam (khurshid-alam) wrote :

@seb128

U-c-c pulls unity-settings-daemon and unity-settings-daemon pulls unity-settings-daemon-schemas.

Sebastien Bacher (seb128) wrote :

ok, that makes sense then!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2019-03-01 16:13:07 +0000
3+++ debian/rules 2019-09-02 23:43:07 +0000
4@@ -18,6 +18,6 @@
5 DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
6
7 binary-post-install/unity-control-center::
8- ./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
9+ ./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
10
11 common-binary-post-install-arch:: list-missing
12
13=== modified file 'panels/keyboard/00-multimedia.xml.in'
14--- panels/keyboard/00-multimedia.xml.in 2011-02-16 18:00:38 +0000
15+++ panels/keyboard/00-multimedia.xml.in 2019-09-02 23:43:07 +0000
16@@ -1,5 +1,5 @@
17 <?xml version="1.0" encoding="UTF-8" ?>
18-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Sound and Media">
19+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Sound and Media">
20
21 <KeyListEntry name="volume-mute" _description="Volume mute"/>
22
23
24=== modified file 'panels/keyboard/01-launchers.xml.in'
25--- panels/keyboard/01-launchers.xml.in 2013-11-28 04:38:37 +0000
26+++ panels/keyboard/01-launchers.xml.in 2019-09-02 23:43:07 +0000
27@@ -1,5 +1,5 @@
28 <?xml version="1.0" encoding="UTF-8" ?>
29-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Launchers">
30+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Launchers">
31
32 <KeyListEntry name="help" _description="Launch help browser"/>
33
34
35=== modified file 'panels/keyboard/01-screenshot.xml.in'
36--- panels/keyboard/01-screenshot.xml.in 2013-11-28 06:01:16 +0000
37+++ panels/keyboard/01-screenshot.xml.in 2019-09-02 23:43:07 +0000
38@@ -1,5 +1,5 @@
39 <?xml version="1.0" encoding="UTF-8" ?>
40-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Screenshots">
41+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Screenshots">
42
43 <KeyListEntry name="screenshot"
44 _description="Take a screenshot"/>
45
46=== modified file 'panels/keyboard/01-system.xml.in'
47--- panels/keyboard/01-system.xml.in 2011-02-16 18:00:38 +0000
48+++ panels/keyboard/01-system.xml.in 2019-09-02 23:43:07 +0000
49@@ -1,5 +1,5 @@
50 <?xml version="1.0" encoding="UTF-8" ?>
51-<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="System">
52+<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="System">
53
54 <KeyListEntry name="logout" _description="Log out"/>
55
56
57=== modified file 'panels/keyboard/50-accessibility.xml.in'
58--- panels/keyboard/50-accessibility.xml.in 2011-11-09 00:04:50 +0000
59+++ panels/keyboard/50-accessibility.xml.in 2019-09-02 23:43:07 +0000
60@@ -1,5 +1,5 @@
61 <?xml version="1.0" encoding="UTF-8"?>
62-<KeyListEntries group="system" _name="Universal Access" schema="org.gnome.settings-daemon.plugins.media-keys">
63+<KeyListEntries group="system" _name="Universal Access" schema="com.canonical.unity.settings-daemon.plugins.media-keys">
64
65 <KeyListEntry name="magnifier" _description="Turn zoom on or off"/>
66
67
68=== modified file 'panels/keyboard/cc-keyboard-item.c'
69--- panels/keyboard/cc-keyboard-item.c 2013-11-28 04:33:09 +0000
70+++ panels/keyboard/cc-keyboard-item.c 2019-09-02 23:43:07 +0000
71@@ -31,7 +31,7 @@
72
73 #define CC_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_ITEM, CcKeyboardItemPrivate))
74
75-#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
76+#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
77
78 struct CcKeyboardItemPrivate
79 {
80
81=== modified file 'panels/keyboard/keyboard-shortcuts.c'
82--- panels/keyboard/keyboard-shortcuts.c 2014-03-14 14:43:48 +0000
83+++ panels/keyboard/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
84@@ -28,8 +28,8 @@
85 #include "cc-keyboard-option.h"
86 #include "wm-common.h"
87
88-#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"
89-#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
90+#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
91+#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
92 #define CUSTOM_SHORTCUTS_ID "custom"
93 #define WID(builder, name) (GTK_WIDGET (gtk_builder_get_object (builder, name)))
94
95
96=== modified file 'panels/region/cc-region-keyboard-item.c'
97--- panels/region/cc-region-keyboard-item.c 2013-11-28 06:02:43 +0000
98+++ panels/region/cc-region-keyboard-item.c 2019-09-02 23:43:07 +0000
99@@ -31,7 +31,7 @@
100
101 #define CC_REGION_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_KEYBOARD_ITEM, CcRegionKeyboardItemPrivate))
102
103-#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
104+#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
105
106 struct CcRegionKeyboardItemPrivate
107 {
108
109=== modified file 'panels/region/keyboard-shortcuts.c'
110--- panels/region/keyboard-shortcuts.c 2013-11-29 06:28:37 +0000
111+++ panels/region/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
112@@ -26,8 +26,8 @@
113 #include "keyboard-shortcuts.h"
114 #include "wm-common.h"
115
116-#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"
117-#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
118+#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
119+#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
120 #define CUSTOM_SHORTCUTS_ID "custom"
121
122 typedef struct {
123
124=== modified file 'panels/universal-access/cc-ua-panel.c'
125--- panels/universal-access/cc-ua-panel.c 2016-10-03 03:43:05 +0000
126+++ panels/universal-access/cc-ua-panel.c 2019-09-02 23:43:07 +0000
127@@ -716,7 +716,7 @@
128 priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
129 priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
130 priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");
131- priv->mediakeys_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
132+ priv->mediakeys_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
133 priv->a11y_profile_settings = g_settings_new ("org.gnome.desktop.a11y");
134 priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");
135

Subscribers

People subscribed via source and target branches