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

Proposed by Khurshid Alam on 2019-09-03
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2019-09-06
Approved revision: 2464
Merged at revision: 2463
Proposed branch: lp:~khurshid-alam/unity-greeter/use-usd-schemas
Merge into: lp:unity-greeter
Diff against target: 25 lines (+2/-2)
2 files modified
debian/rules (+1/-1)
src/settings-daemon.vala (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/unity-greeter/use-usd-schemas
Reviewer Review Type Date Requested Status
Sebastien Bacher 2019-09-03 Pending
Review via email: mp+372186@code.launchpad.net

Commit message

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

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

Indeed

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-02-19 16:16:52 +0000
3+++ debian/rules 2019-09-03 10:35:47 +0000
4@@ -11,7 +11,7 @@
5
6 override_dh_auto_build:
7 dh_auto_build
8- ./src/logo-generator --logo data/logo-bare.png --text '19.04' --output logo.png
9+ ./src/logo-generator --logo data/logo-bare.png --text '19.10' --output logo.png
10
11 override_dh_auto_install:
12 dh_auto_install
13
14=== modified file 'src/settings-daemon.vala'
15--- src/settings-daemon.vala 2014-07-30 04:59:42 +0000
16+++ src/settings-daemon.vala 2019-09-03 10:35:47 +0000
17@@ -34,7 +34,7 @@
18 "org.gnome.settings-daemon.plugins.housekeeping",
19 "org.gnome.settings-daemon.plugins.keybindings",
20 "org.gnome.settings-daemon.plugins.keyboard",
21- "org.gnome.settings-daemon.plugins.media-keys",
22+ "com.canonical.unity.settings-daemon.plugins.media-keys",
23 "org.gnome.settings-daemon.plugins.mouse",
24 "org.gnome.settings-daemon.plugins.print-notifications",
25 "org.gnome.settings-daemon.plugins.smartcard",

Subscribers

People subscribed via source and target branches