On Jun 3, 2011, at 3:52 AM, Alex Valavanis wrote:

Alex Valavanis has proposed merging lp:~valavanisalex/inkscape/fix-792263 into lp:inkscape.

Requested reviews: Inkscape Developers (inkscape.dev) Related bugs: Bug #792263 in Inkscape: "Do not include individual GTK+ headers" https://bugs.launchpad.net/inkscape/+bug/792263

For more details, see: https://code.launchpad.net/~valavanisalex/inkscape/fix-792263/+merge/63364

I've gone through the code and replaced all gdk/gtk headers with generic headers in preparation for an eventual move to gtk+ 3. See http://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html#id1391340 for details.

I have made sure that the code compiles with GTK_DISABLE_SINGLE_INCLUDES defined.

It's quite a big diff, affecting many files so I don't feel comfortable committing it to trunk straight away. Please could someone take a look, and consider merging?

Thanks

Ah, yes. The change-to-really-slow-down-compile-time-and-break-modularity include mess GTK has doubled down on. :-(

Thanks for slogging through the effort to get this together. I'll be going over it and hopefully getting it in soon.

(I know I'd been procrastinating since the poor architectural choice has just grated on me, but we do need to get this resolved).

BTW, we only just this past few weeks bumped Inkscape up to require GTK 2.20 for building, so it might be a fair bit more before we make a 3.x push overall. The header fix does help, though.