Merge lp://staging/~mitya57/indicator-session/settings-daemon-schema into lp://staging/indicator-session

Proposed by Dmitry Shachnev
Status: Merged
Approved by: Alberts Muktupāvels
Approved revision: 509
Merged at revision: 507
Proposed branch: lp://staging/~mitya57/indicator-session/settings-daemon-schema
Merge into: lp://staging/indicator-session
Diff against target: 93 lines (+46/-5)
2 files modified
debian/control (+1/-1)
src/service.c (+45/-4)
To merge this branch: bzr merge lp://staging/~mitya57/indicator-session/settings-daemon-schema
Reviewer Review Type Date Requested Status
Khurshid Alam (community) Approve
Alberts Muktupāvels Approve
Marco Trevisan (Treviño) Pending
Indicator Applet Developers Pending
Review via email: mp+400245@code.staging.launchpad.net

Commit message

Use unity-settings-daemon GSettings schema only on Unity. On the other desktops, use gnome-settings-daemon schema.

Description of the change

This makes the behavior introduced in https://code.launchpad.net/~khurshid-alam/indicator-session/use-usd-schemas/+merge/372301 conditional on $XDG_CURRENT_DESKTOP value.

This fixes wrong keybinding for Lock that was shown on GNOME Flashback session. indicator-session showed Ctrl+Alt+L while it is really Super+L.

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve
507. By Dmitry Shachnev

Use unity-settings-daemon GSettings schema only on Unity

On the other desktops, use gnome-settings-daemon schema.

508. By Dmitry Shachnev

Adapt for screensaver key changing to array of strings in g-s-d >= 3.33.0

https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/103

509. By Dmitry Shachnev

Move unity-settings-daemon-schemas from Depends to Recommends

Anyone who is using Unity will have this package installed anyway.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@Dmitry

Ok. This seems merged. But just wanted to point out unity remix people build unity-mini iso from netboot (and now cloud/core) image.

https://wiki.ubuntu.com/UbuntuUnityExperience/mimimal-unity-installation

For that unity-settings-daemon-schemas is needed to in depends no ?

Revision history for this message
Khurshid Alam (khurshid-alam) :
review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Hi Khurshid!

unity has a hard dependency on unity-settings-daemon-schemas. So if unity itself is installed, that package will be installed too:

https://git.launchpad.net/unity/tree/debian/control#n80

So I think there is no need to depend on it here.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches