Port to GTK 3