[gtk+/quartz-integration] Use generic marshaler
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration] Use generic marshaler
- Date: Sat, 23 Jul 2011 14:07:08 +0000 (UTC)
commit fb4d5e3c322fcf05b65f440a94edbac3eff83e3e
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 22 18:49:44 2011 -0400
Use generic marshaler
If only to keep people from refiling the same issue over
and over again...
perf/Makefile.am | 18 ------------------
perf/gtkwidgetprofiler.c | 5 ++---
perf/marshalers.list | 2 --
3 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 6bb0ce7..e76f605 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 afbc53d..0a42f14 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]