[maemo-commits] [maemo-commits] r15673 - in projects/haf/trunk/gtk+: . gdk gdk-pixbuf gtk perf
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jun 23 14:01:35 EEST 2008
- Previous message: [maemo-commits] r15672 - in projects/haf/trunk/glib: . gio gobject
- Next message: [maemo-commits] r15674 - in projects/haf/trunk/gtk+: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kris Date: 2008-06-23 14:01:25 +0300 (Mon, 23 Jun 2008) New Revision: 15673 Modified: projects/haf/trunk/gtk+/ChangeLog projects/haf/trunk/gtk+/gdk-pixbuf/Makefile.am projects/haf/trunk/gtk+/gdk/Makefile.am projects/haf/trunk/gtk+/gtk/Makefile.am projects/haf/trunk/gtk+/gtk/gtkenums.h projects/haf/trunk/gtk+/gtk/gtkwidget.c projects/haf/trunk/gtk+/perf/Makefile.am Log: 2008-06-23 Kristian Rietveld <kris at imendio.com> * gdk/Makefile.am: * gdk-pixbuf/Makefile.am: * gtk/Makefile.am: * perf/Makefile.am: do not hard code the prefix of the enum, use @ENUMPREFIX@ instead. * gtk/gtkwidget.c (gtk_widget_class_init): use HILDON_TYPE_MODE for the hildon-mode style property instead of GTK_TYPE_MODE. * gtk/gtkenums.h: add a temporary define to map GTK_TYPE_GTK_INPUT_MODE to HILDON_TYPE_GTK_INPUT_MODE. Modified: projects/haf/trunk/gtk+/ChangeLog =================================================================== --- projects/haf/trunk/gtk+/ChangeLog 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/ChangeLog 2008-06-23 11:01:25 UTC (rev 15673) @@ -1,3 +1,17 @@ +2008-06-23 Kristian Rietveld <kris at imendio.com> + + * gdk/Makefile.am: + * gdk-pixbuf/Makefile.am: + * gtk/Makefile.am: + * perf/Makefile.am: do not hard code the prefix of the enum, + use @ENUMPREFIX@ instead. + + * gtk/gtkwidget.c (gtk_widget_class_init): use HILDON_TYPE_MODE + for the hildon-mode style property instead of GTK_TYPE_MODE. + + * gtk/gtkenums.h: add a temporary define to map + GTK_TYPE_GTK_INPUT_MODE to HILDON_TYPE_GTK_INPUT_MODE. + 2008-06-20 Michael Natterer <mitch at imendio.com> * Merge the testing framework and all unit tests from upstream Modified: projects/haf/trunk/gtk+/gdk/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/gdk/Makefile.am 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/gdk/Makefile.am 2008-06-23 11:01:25 UTC (rev 15673) @@ -246,7 +246,7 @@ ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define GDK_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \ + --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX at _TYPE_@ENUMSHORT@ (@enum_name at _get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __GDK_ENUM_TYPES_H__ */" \ $(gdk_public_h_sources) ) >> xgen-geth \ && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ Modified: projects/haf/trunk/gtk+/gdk-pixbuf/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/gdk-pixbuf/Makefile.am 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/gdk-pixbuf/Makefile.am 2008-06-23 11:01:25 UTC (rev 15673) @@ -412,7 +412,7 @@ ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define GDK_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \ + --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX at _TYPE_@ENUMSHORT@ (@enum_name at _get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \ $(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \ && (cmp -s tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h ) \ Modified: projects/haf/trunk/gtk+/gtk/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/gtk/Makefile.am 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/gtk/Makefile.am 2008-06-23 11:01:25 UTC (rev 15673) @@ -809,7 +809,7 @@ ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \ + --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX at _TYPE_@ENUMSHORT@ (@enum_name at _get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \ $(gtk_public_h_sources) ) >> xgen-gtbh \ && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ Modified: projects/haf/trunk/gtk+/gtk/gtkenums.h =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkenums.h 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/gtk/gtkenums.h 2008-06-23 11:01:25 UTC (rev 15673) @@ -545,6 +545,9 @@ HILDON_GTK_INPUT_MODE_DICTIONARY = 1 << 31 } HildonGtkInputMode; +/* Temporary compatibility define */ +#define GTK_TYPE_GTK_INPUT_MODE HILDON_TYPE_GTK_INPUT_MODE + typedef enum { HILDON_DIABLO, Modified: projects/haf/trunk/gtk+/gtk/gtkwidget.c =================================================================== --- projects/haf/trunk/gtk+/gtk/gtkwidget.c 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/gtk/gtkwidget.c 2008-06-23 11:01:25 UTC (rev 15673) @@ -2554,7 +2554,7 @@ g_param_spec_enum ("hildon-mode", P_("Hildon Mode"), P_("The mode according to which widgets should behave"), - GTK_TYPE_MODE, + HILDON_TYPE_MODE, HILDON_DIABLO, GTK_PARAM_READABLE)); #endif /* MAEMO_CHANGES */ Modified: projects/haf/trunk/gtk+/perf/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/perf/Makefile.am 2008-06-23 10:53:25 UTC (rev 15672) +++ projects/haf/trunk/gtk+/perf/Makefile.am 2008-06-23 11:01:25 UTC (rev 15673) @@ -75,7 +75,7 @@ ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __TYPE_BUILTINS_H__\n#define __TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \ + --vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX at _TYPE_@ENUMSHORT@ (@enum_name at _get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __TYPE_BUILTINS_H__ */" \ $(headers_with_enums) ) >> xgen-gtbh \ && (cmp -s xgen-gtbh typebuiltins.h || cp xgen-gtbh typebuiltins.h ) \
- Previous message: [maemo-commits] r15672 - in projects/haf/trunk/glib: . gio gobject
- Next message: [maemo-commits] r15674 - in projects/haf/trunk/gtk+: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]