sync to safemode branch -r12358, remove unecessary glade check
Authored by: safemode 2008-06-10
Parent: [r12358]
Child: [r12360]