code migrated from PyGTK to PyGObject
Merge remote-tracking branch 'steven/master'
merge cleanup