maemo.org Bugzilla – Bug 823
support for Hildon specific hacks to GTK+ should be conditional
Last modified: 2008-12-06 13:19:08 UTC
You need to log in before you can comment on or make changes to this bug.
The attached patch makes the support for Hildon-specific GTK+ changes conditional at least at compilation time. Checks are made at configure time. Please double-check amd fix my autoconf-fu :)
Created an attachment (id=125) [details] Compiles with upstream GTK Please consider reviewing and applying to trunk.
Note that bug# 822 needs to be fixed too in order to actually compile with a recent gcc.
Tommi, how this relates to MAEMO_CHANGES?
If you do not define MAEMO_CHANGES the added functions, enums, function pointers will not be available and if you try to use them the compilation will fail. It does not catch property access, though (they probably should be encapsulated in functions) What Johan's patch does is to remove any attempts to use our extended functionality so that hildon can be compiled against stock gtk (or maemo gtk without MAEMO_CHANGES) I think we should have --enable-gtk-extensions[=yes/no/auto] configure flag (default=auto) which would determine whether MAEMO_CHANGES gets defined (while building as well as in the pkgconfig file) and our gtk extensions are even attempted to be used. Did that make any sense? btw, GDK_WINDOW_TYPE_HINT_MESSAGE should be replaced with GDK_WINDOW_TYPE_HINT_NOTIFICATION as soon as we have matchbox which supports the hint. That would be one patch/conditional less.
Created an attachment (id=192) [details] more recent version Attaching last version of the patch i used for the archive
(reassigned to Michael)
Created an attachment (id=533) [details] Define -DMAEMO_CHANGES conditionally This patch only define MAEMO_CHANGES if MAEMO_GTK is used.
(In reply to comment #5) > Created an attachment (id=192) [details] [details] > more recent version hildon-1 already have #ifdef MAEMO_GTK. My patch defines the MAEMO_CHANGES only if MAEMO GTK is used. Currently hildon-1 in Ubuntu/Gutsy also defines the MAEMO_CHANGES in the CFLAGS and pkgconfig and I think that should be turned off there.
I committed this to trunk now, thanks for the patch!
(changing Version from "sardine" to "unspecified" for consistency with other products)