Adapted to latest GTK changes