[Merge] lp:~ochosi/xdg-utils/support_xfce into lp:ubuntu/xdg-utils

[Simon Steinbeiß]

Simon Steinbeiß has proposed merging lp:~ochosi/xdg-utils/support_xfce into lp:ubuntu/xdg-utils.

Requested reviews:
  Sebastien Bacher (seb128)
Related bugs:
  Bug #1309744 in light-locker (Ubuntu): "Light Locker blanks the screen when playing video"
  https://bugs.launchpad.net/ubuntu/+source/light-locker/+bug/1309744

For more details, see:
https://code.launchpad.net/~ochosi/xdg-utils/support_xfce/+merge/224076

This is a very simple patch that provides a fallback for the Xfce DE. Until 14.04, we used xscreensaver, so there was no special case needed for Xfce. However, now that we're using light-locker, xdg-screensaver should handle the X11 screensaver extension's settings (if XScreenSaver isn't installed or in use).

This simple patch does exactly that. It checks for the "xfce" DE *after* checking for XScreenSaver and then let's xdg-screensaver handle things correctly.

This branch fixes https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/1309744
-- 
https://code.launchpad.net/~ochosi/xdg-utils/support_xfce/+merge/224076
Your team Ubuntu branches is subscribed to branch lp:ubuntu/xdg-utils.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 286 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140623/9ffd8ae0/attachment.diff>