diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-07-22 18:49:44 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-07-22 18:51:11 -0400 |
| commit | 71a70a7d5cbf7750149702dd7aea67f2f3af45b9 (patch) | |
| tree | 0acd8fb80bfb51327526902ded11590310d198fe | |
| parent | edcce8e6baba0dac06c4c59433e28023b7a8163c (diff) | |
| download | gtk+-71a70a7d5cbf7750149702dd7aea67f2f3af45b9.tar.gz | |
Use generic marshaler
If only to keep people from refiling the same issue over
and over again...
| -rw-r--r-- | perf/Makefile.am | 18 | ||||
| -rw-r--r-- | perf/gtkwidgetprofiler.c | 5 | ||||
| -rw-r--r-- | perf/marshalers.list | 2 |
3 files changed, 2 insertions, 23 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index 6bb0ce767f..e76f605bc3 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -30,8 +30,6 @@ testperf_SOURCES = \ gtkwidgetprofiler.c \ gtkwidgetprofiler.h \ main.c \ - marshalers.c \ - marshalers.h \ textview.c \ treeview.c \ typebuiltins.c \ @@ -39,13 +37,10 @@ testperf_SOURCES = \ widgets.h BUILT_SOURCES = \ - marshalers.c \ - marshalers.h \ typebuiltins.c \ typebuiltins.h stamp_files = \ - stamp-marshalers.h \ stamp-typebuiltins.h headers_with_enums = \ @@ -53,18 +48,6 @@ headers_with_enums = \ MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files) -marshalers.h: stamp-marshalers.h - @true - -stamp-marshalers.h: @REBUILD@ marshalers.list - $(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \ - && (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \ - && rm -f xgen-gmlh \ - && echo timestamp > $(@F) -marshalers.c: @REBUILD@ marshalers.list - $(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \ - && cp xgen-gmlc marshalers.c \ - && rm -f xgen-gmlc typebuiltins.h: stamp-typebuiltins.h @true @@ -83,7 +66,6 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) typebuiltins.c.template EXTRA_DIST += \ README \ - marshalers.list \ typebuiltins.c.template \ typebuiltins.h.template \ $(BUILT_SOURCES) diff --git a/perf/gtkwidgetprofiler.c b/perf/gtkwidgetprofiler.c index afbc53dd22..0a42f1427a 100644 --- a/perf/gtkwidgetprofiler.c +++ b/perf/gtkwidgetprofiler.c @@ -1,7 +1,6 @@ #include "config.h" #include <string.h> #include "gtkwidgetprofiler.h" -#include "marshalers.h" #include "typebuiltins.h" typedef enum { @@ -53,7 +52,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetProfilerClass, create_widget), NULL, NULL, - _testperf_marshal_OBJECT__VOID, + NULL, G_TYPE_OBJECT, 0); signals[REPORT] = @@ -62,7 +61,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetProfilerClass, report), NULL, NULL, - _testperf_marshal_VOID__ENUM_OBJECT_DOUBLE, + NULL, G_TYPE_NONE, 3, GTK_TYPE_WIDGET_PROFILER_REPORT, G_TYPE_OBJECT, diff --git a/perf/marshalers.list b/perf/marshalers.list deleted file mode 100644 index 413f2480c6..0000000000 --- a/perf/marshalers.list +++ /dev/null @@ -1,2 +0,0 @@ -OBJECT:VOID -VOID:ENUM,OBJECT,DOUBLE |