Merge ~khurshid-alam/unity:port-media-keys-schemas into unity:master

Proposed by Khurshid Alam on 2019-09-02
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2019-09-09
Approved revision: 51c70e34b9a2c004cdccf107901929084b5e9a1b
Merged at revision: d0cee89811e15ee500f5cde3a2680983eca7a194
Proposed branch: ~khurshid-alam/unity:port-media-keys-schemas
Merge into: unity:master
Diff against target: 81 lines (+13/-5)
6 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+8/-0)
lockscreen/LockScreenAcceleratorController.cpp (+1/-1)
services/CMakeLists.txt (+1/-1)
shortcuts/ShortcutHint.cpp (+1/-1)
tests/data/external.gschema.xml (+1/-1)
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2019-09-06 Approve on 2019-09-09
Sebastien Bacher 2019-09-02 Pending
Review via email: mp+372173@code.launchpad.net

Commit message

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

* Pick up changes made by Iain Lane from launchpad source

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

Ok, makes sense.

review: Approve
Khurshid Alam (khurshid-alam) wrote :

This one hasn't merged yet ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 03bbea3..249b8fc 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -209,7 +209,7 @@ if (BOOT_LOGGER)
6 SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
7 endif (BOOT_LOGGER)
8
9-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
10+SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
11
12 option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
13 if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
14diff --git a/debian/changelog b/debian/changelog
15index f6eb327..ebeef1f 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,11 @@
19+unity (7.5.0+19.04.20190827-0ubuntu1) eoan; urgency=medium
20+
21+ * Disable Werror. It doesn't make sense to fail on compiler warnings for the
22+ distro.
23+ * Rebuild against libgnome-desktop-3-18
24+
25+ -- Iain Lane <iain@orangesquash.org.uk> Tue, 27 Aug 2019 11:10:00 +0100
26+
27 unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium
28
29 [ disco/unity: Failed to merge https://git.launchpad.net/unity. ]
30diff --git a/lockscreen/LockScreenAcceleratorController.cpp b/lockscreen/LockScreenAcceleratorController.cpp
31index 49dbd3b..ae9c3f0 100644
32--- a/lockscreen/LockScreenAcceleratorController.cpp
33+++ b/lockscreen/LockScreenAcceleratorController.cpp
34@@ -34,7 +34,7 @@ namespace
35 {
36 DECLARE_LOGGER(logger, "unity.lockscreen.accelerator.controller");
37
38-const std::string MEDIA_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys";
39+const std::string MEDIA_KEYS_SCHEMA = "com.canonical.unity.settings-daemon.plugins.media-keys";
40 const std::vector<std::string> ALLOWED_MEDIA_KEYS = {
41 "logout",
42 "magnifier",
43diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
44index fe5dff1..2829cd2 100644
45--- a/services/CMakeLists.txt
46+++ b/services/CMakeLists.txt
47@@ -34,7 +34,7 @@ set(PANEL_SOURCES
48 set(CFLAGS
49 ${SERVICE_DEPS_CFLAGS}
50 ${SERVICE_DEPS_CFLAGS_OTHER}
51- "-Werror -Wall -Wno-error=deprecated-declarations"
52+ "-Wall -Wno-error=deprecated-declarations"
53 )
54
55 string (REPLACE ";" " " CFLAGS "${CFLAGS}")
56diff --git a/shortcuts/ShortcutHint.cpp b/shortcuts/ShortcutHint.cpp
57index 8983745..44f26f3 100644
58--- a/shortcuts/ShortcutHint.cpp
59+++ b/shortcuts/ShortcutHint.cpp
60@@ -31,7 +31,7 @@ namespace shortcut
61 {
62 namespace
63 {
64- const std::string GNOME_MEDIA_SETTINGS = "org.gnome.settings-daemon.plugins.media-keys";
65+ const std::string GNOME_MEDIA_SETTINGS = "com.canonical.unity.settings-daemon.plugins.media-keys";
66 DECLARE_LOGGER(logger, "unity.shortcut");
67 }
68 // Ctor
69diff --git a/tests/data/external.gschema.xml b/tests/data/external.gschema.xml
70index 9b7c1a2..4fff60d 100644
71--- a/tests/data/external.gschema.xml
72+++ b/tests/data/external.gschema.xml
73@@ -141,7 +141,7 @@
74 </key>
75 </schema>
76
77- <schema id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
78+ <schema id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/">
79 <key type="s" name="volume-mute">
80 <default>'XF86AudioMute'</default>
81 </key>

Subscribers

People subscribed via source and target branches