Merge fixes from cloud_sync branch.

Signed-off-by: Rob Caelers <robc@krandor.org>
Fix gtk2 win32 compilation.

Signed-off-by: Rob Caelers <robc@krandor.org>