Merge branch 'stevenhoneyman-gtk3' into gtk3
Fix -Wparentheses compiler warning
Fix white color volmeter
Add missing include
Update gtk version in gtk-builder xml
Fix desktop file wrt #18
Merge branch 'gtk3' of https://github.com/hasufell/pnmixer into gtk3

Conflicts:
	src/hotkeys.c