Fix the unused arguments warnings

https://bugzilla.gnome.org/show_bug.cgi?id=710076
Canonicalize the spacing around if statements and g_return_* invocations