Permalink
Browse files

Use generic marshaler

If only to keep people from refiling the same issue over
and over again...
  • Loading branch information...
1 parent edcce8e commit 71a70a7d5cbf7750149702dd7aea67f2f3af45b9 Matthias Clasen committed Jul 22, 2011
Showing with 2 additions and 23 deletions.
  1. +0 −18 perf/Makefile.am
  2. +2 −3 perf/gtkwidgetprofiler.c
  3. +0 −2 perf/marshalers.list
View
@@ -30,41 +30,24 @@ testperf_SOURCES = \
gtkwidgetprofiler.c \
gtkwidgetprofiler.h \
main.c \
- marshalers.c \
- marshalers.h \
textview.c \
treeview.c \
typebuiltins.c \
typebuiltins.h \
widgets.h
BUILT_SOURCES = \
- marshalers.c \
- marshalers.h \
typebuiltins.c \
typebuiltins.h
stamp_files = \
- stamp-marshalers.h \
stamp-typebuiltins.h
headers_with_enums = \
gtkwidgetprofiler.h
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)
View
@@ -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,
View
@@ -1,2 +0,0 @@
-OBJECT:VOID
-VOID:ENUM,OBJECT,DOUBLE

0 comments on commit 71a70a7

Please sign in to comment.