Power Manager cleanup

[cosiekvfj]

Hello. I'm working on some bugs in Power Manager. This is mostly cleanup for later.   Please review.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.xfce.org/pipermail/xfce4-dev/attachments/20190328/59c1b97f/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-config-consolidation.patch
Type: text/x-patch
Size: 51999 bytes
Desc: not available
URL: <https://mail.xfce.org/pipermail/xfce4-dev/attachments/20190328/59c1b97f/attachment-0001.bin>