summaryrefslogtreecommitdiff
diff options
authorKhurshid Alam <khurshid.alam@linuxmail.org>2019-09-02 20:28:09 +0530
committerKhurshid Alam <khurshid.alam@linuxmail.org>2019-09-03 00:36:11 +0530
commit51c70e34b9a2c004cdccf107901929084b5e9a1b (patch)
tree541ba5cd2ff48b2572fef8b7bae6b19d676441c2
parent41cb528fc394a9d29e84f745dccc872b22077512 (diff)
Port media keys to use com.canonical.unity.settings-daemon. Fixes LP:#1842324
-rw-r--r--lockscreen/LockScreenAcceleratorController.cpp2
-rw-r--r--shortcuts/ShortcutHint.cpp2
-rw-r--r--tests/data/external.gschema.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/lockscreen/LockScreenAcceleratorController.cpp b/lockscreen/LockScreenAcceleratorController.cpp
index 49dbd3bf1..ae9c3f005 100644
--- a/lockscreen/LockScreenAcceleratorController.cpp
+++ b/lockscreen/LockScreenAcceleratorController.cpp
@@ -34,7 +34,7 @@ namespace
{
DECLARE_LOGGER(logger, "unity.lockscreen.accelerator.controller");
-const std::string MEDIA_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys";
+const std::string MEDIA_KEYS_SCHEMA = "com.canonical.unity.settings-daemon.plugins.media-keys";
const std::vector<std::string> ALLOWED_MEDIA_KEYS = {
"logout",
"magnifier",
diff --git a/shortcuts/ShortcutHint.cpp b/shortcuts/ShortcutHint.cpp
index 898374543..44f26f30c 100644
--- a/shortcuts/ShortcutHint.cpp
+++ b/shortcuts/ShortcutHint.cpp
@@ -31,7 +31,7 @@ namespace shortcut
{
namespace
{
- const std::string GNOME_MEDIA_SETTINGS = "org.gnome.settings-daemon.plugins.media-keys";
+ const std::string GNOME_MEDIA_SETTINGS = "com.canonical.unity.settings-daemon.plugins.media-keys";
DECLARE_LOGGER(logger, "unity.shortcut");
}
// Ctor
diff --git a/tests/data/external.gschema.xml b/tests/data/external.gschema.xml
index 9b7c1a2d0..4fff60d86 100644
--- a/tests/data/external.gschema.xml
+++ b/tests/data/external.gschema.xml
@@ -141,7 +141,7 @@
</key>
</schema>
- <schema id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
+ <schema id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/">
<key type="s" name="volume-mute">
<default>'XF86AudioMute'</default>
</key>