themes-2 struct change?

[foofboy foofnet dyn ml org]

Hey, guys

After building glib, gtk+ and imlib from yesterday evenings snapshots into a clean (empty) directory, all former traces of gnome having been removed, I try to make the themes/ directory of the themes-2 branch of gdk.

After several warnings of the form:
initialization from incompatible pointer
	or
excess elements in struct initializer after `th_default_class'

Finally, the error:
pixmap_theme_draw.c: In function `match_theme_image':
pixmap_theme_draw.c:336: structure has no member named `engine_data'

I grepped around, and found the definition of the struct in question, GtkStyle, in (I believe) gtkstyle.h, and, indeed it didn't contain a member called engine_data. My question is whether there has been a change in the CVS tree, whether the new theme stuff is somewhere else now? Or whether I'm making some horrible mistake. :)

All help appreciated.
Thanks

Rob