Session Menu

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

  1. use-usd-schemas
  2. Merge into trunk.16.10
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
1=== modified file 'debian/control'
2--- debian/control 2019-01-09 16:53:55 +0000
3+++ debian/control 2019-09-05 07:31:20 +0000
4@@ -13,7 +13,8 @@
5 lcov,
6 libglib2.0-dev (>= 2.36),
7 libwhoopsie-dev (>= 0.2.52),
8- python,
9+ python3,
10+ unity-settings-daemon-schemas,
11 systemd,
12 Standards-Version: 3.9.3
13 Homepage: https://launchpad.net/indicator-session
14@@ -29,6 +30,7 @@
15 Depends: ${shlibs:Depends},
16 ${misc:Depends},
17 libpam-systemd,
18+ unity-settings-daemon-schemas,
19 gnome-settings-daemon-common,
20 gsettings-desktop-schemas,
21 indicator-common,
22
23=== modified file 'src/service.c'
24--- src/service.c 2017-03-09 15:50:46 +0000
25+++ src/service.c 2019-09-05 07:31:20 +0000
26@@ -1298,7 +1298,7 @@
27 INDICATOR_TYPE_SESSION_SERVICE,
28 IndicatorSessionServicePrivate);
29 p->indicator_settings = g_settings_new ("com.canonical.indicator.session");
30- p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
31+ p->keybinding_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
32
33 /* Only use unity8 schema if it's installed; this avoids a hard dependency
34 on unity8-schemas */

Subscribers

People subscribed via source and target branches