Fix a self assignment issue raised by clang For https://bugzilla.gnome.org/show_bug.cgi?id=751679 Also added a few newline cleanups
2015-06-30T10:47:16