Updated for gtk+-1.3.9 and misc changes