Comment 5 for bug 533318

This patch works for me.
But detecting desktop-file location this way is ugly. I will try to rework it in future.
I've also fix some whitespace while here.