Merge ~khurshid-alam/ubuntu/+source/ubuntu-settings:usd-schemas into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

Proposed by Khurshid Alam on 2019-09-03
Status: Merged
Approved by: Sebastien Bacher on 2019-09-21
Approved revision: 60440780019bff265595d03b9813ebe73975ee91
Merged at revision: 60440780019bff265595d03b9813ebe73975ee91
Proposed branch: ~khurshid-alam/ubuntu/+source/ubuntu-settings:usd-schemas
Merge into: ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Diff against target: 13 lines (+0/-3)
1 file modified
debian/ubuntu-settings.gsettings-override (+0/-3)
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2019-09-07
Sebastien Bacher 2019-09-03 Pending
Review via email: mp+372202@code.launchpad.net

Commit message

Remove screensaver override for unity

Unity is now using it's own schema for media keys. See LP: #1842324

Description of the change

Note, lp:~ubuntu-desktop/ubuntu/+source/ubuntu-settings is out of sync with launchpad source lp:ubuntu/+source/ubuntu-settings but I can't open merge against lp:ubuntu/+source/ubuntu-settings.

Edit: It is now resolved, thanks to Laney.

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

Mh, since such settings are now handled in unity schema, wouldn't be better to just remove this override from unity settings (code is now in git though, at https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+ref/master).

So, I'd just remove this from ubuntu-settings and move it at https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154

review: Disapprove
Khurshid Alam (khurshid-alam) wrote :

Right, it makes sense.

Khurshid Alam (khurshid-alam) wrote :

I have now removed the override.

Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override
2index 83126da..fa2ee98 100644
3--- a/debian/ubuntu-settings.gsettings-override
4+++ b/debian/ubuntu-settings.gsettings-override
5@@ -190,9 +190,6 @@ unmaximize = ['<Primary><Super>Down','<Super>Down','<Alt>F5']
6 [org.gnome.settings-daemon.plugins.background:Unity]
7 active = true
8
9-[org.gnome.settings-daemon.plugins.media-keys:Unity]
10-screensaver = ['<Control><Alt>l']
11-
12 [org.gnome.Terminal.Legacy.Settings:Unity]
13 headerbar = false
14

Subscribers

People subscribed via source and target branches