Avoid warnings with Gtk+ 3.0
Build fix for Gtk+ 3.0
Avoid warnings when compiling with Gtk+ 3.0
Avoid warnings when compiling with Gtk+ 3.0
Avoid warnings when compiling with Gtk+ 3.0
Code cleanup