Fix client not working on GTK.
Merge pull request #183 from greboid/tidying

Fix client not working on GTK.