Make lock-on-suspend independent form lock-enabled

This was a regression in my logind support patch.
Lock screen when lid closed

This was a regression in the upower-1.0 patch.
Really fix the error with merge
Merge pull request #39 from City-busz/fix-lock-on-suspend

Fix lock on suspend