Merge lp:~khurshid-alam/indicator-session/use-usd-schemas into lp:indicator-session

Proposed by Khurshid Alam
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 503
Merged at revision: 503
Proposed branch: lp:~khurshid-alam/indicator-session/use-usd-schemas
Merge into: lp:indicator-session
Diff against target: 34 lines (+4/-2)
2 files modified
debian/control (+3/-1)
src/service.c (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/indicator-session/use-usd-schemas
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Sebastien Bacher Pending
Review via email: mp+372301@code.launchpad.net

Commit message

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

* Use python3 in build-depends

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

ACK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2019-01-09 16:53:55 +0000
+++ debian/control 2019-09-05 07:31:20 +0000
@@ -13,7 +13,8 @@
13 lcov,13 lcov,
14 libglib2.0-dev (>= 2.36),14 libglib2.0-dev (>= 2.36),
15 libwhoopsie-dev (>= 0.2.52),15 libwhoopsie-dev (>= 0.2.52),
16 python,16 python3,
17 unity-settings-daemon-schemas,
17 systemd,18 systemd,
18Standards-Version: 3.9.319Standards-Version: 3.9.3
19Homepage: https://launchpad.net/indicator-session20Homepage: https://launchpad.net/indicator-session
@@ -29,6 +30,7 @@
29Depends: ${shlibs:Depends},30Depends: ${shlibs:Depends},
30 ${misc:Depends},31 ${misc:Depends},
31 libpam-systemd,32 libpam-systemd,
33 unity-settings-daemon-schemas,
32 gnome-settings-daemon-common,34 gnome-settings-daemon-common,
33 gsettings-desktop-schemas,35 gsettings-desktop-schemas,
34 indicator-common,36 indicator-common,
3537
=== modified file 'src/service.c'
--- src/service.c 2017-03-09 15:50:46 +0000
+++ src/service.c 2019-09-05 07:31:20 +0000
@@ -1298,7 +1298,7 @@
1298 INDICATOR_TYPE_SESSION_SERVICE,1298 INDICATOR_TYPE_SESSION_SERVICE,
1299 IndicatorSessionServicePrivate);1299 IndicatorSessionServicePrivate);
1300 p->indicator_settings = g_settings_new ("com.canonical.indicator.session");1300 p->indicator_settings = g_settings_new ("com.canonical.indicator.session");
1301 p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");1301 p->keybinding_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
13021302
1303 /* Only use unity8 schema if it's installed; this avoids a hard dependency1303 /* Only use unity8 schema if it's installed; this avoids a hard dependency
1304 on unity8-schemas */1304 on unity8-schemas */

Subscribers

People subscribed via source and target branches