Linux client - merge xscreensaver changes