[COMMIT] Get the GTK2 code building with recent trunk changes.