[Merge] lp:~khurshid-alam/unity-settings-daemon/media-keys-fix into lp:unity-settings-daemon

[Khurshid Alam]

The proposal to merge lp:~khurshid-alam/unity-settings-daemon/media-keys-fix into lp:unity-settings-daemon has been updated.

Commit message changed to:

* media-keys: Add more debug info

  This backports commits dc13b2d, 5f01643 & a09ae56 from gnome-settings-daemon.

* media-keys: Fix cancelled async calls usage

  This backports commits 86cbfda + 5147e6b & 214145c from gnome-settings-daemon.

* DESKTOP_SESSION is now unity

  Unity uses legacy key-grabber code. But since artful unity isn't the default session anymore and DESKTOP_SESSION changed from ubuntu to unity. Fixes LP: #1755106 LP: #1188569 LP: #1727842

For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/media-keys-fix/+merge/359935
-- 
Your team Unity Settings Daemon Development Team is requested to review the proposed merge of lp:~khurshid-alam/unity-settings-daemon/media-keys-fix into lp:unity-settings-daemon.