aboutsummaryrefslogtreecommitdiffstats
path: root/libgnomecanvas
diff options
context:
space:
mode:
Diffstat (limited to 'libgnomecanvas')
-rw-r--r--libgnomecanvas/Makefile.am10
-rw-r--r--libgnomecanvas/gnome-canvas-marshal.list2
-rw-r--r--libgnomecanvas/gnome-canvas.c8
3 files changed, 2 insertions, 18 deletions
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index 02fa1e025b..a1eb3f1e26 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -49,13 +49,6 @@ libgnomecanvas_la_SOURCES = \
gnome-canvas-widget.c \
gnome-canvas.c
-include $(top_srcdir)/glib-gen.mak
-glib_enum_prefix=gnome_canvas
-
-MARSHAL_GENERATED = \
- gnome-canvas-marshal.c \
- gnome-canvas-marshal.h
-
libgnomecanvas_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(MATH_LIB)
@@ -66,7 +59,4 @@ BUILT_SOURCES = $(MARSHAL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = \
- gnome-canvas-marshal.list
-
-include $(top_srcdir)/git.mk
diff --git a/libgnomecanvas/gnome-canvas-marshal.list b/libgnomecanvas/gnome-canvas-marshal.list
deleted file mode 100644
index c2f9657b0c..0000000000
--- a/libgnomecanvas/gnome-canvas-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:BOXED,INT,INT,INT,INT
-BOOLEAN:BOXED
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index 8911e610eb..62cc77268a 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -91,8 +91,6 @@
#include "gnome-canvas.h"
#include "gnome-canvas-i18n.h"
#include "gnome-canvas-util.h"
-#include "gnome-canvas-marshal.h"
-#include "gnome-canvas-marshal.c"
/* We must run our idle update handler *before* GDK wants to redraw. */
#define CANVAS_IDLE_PRIORITY (GDK_PRIORITY_REDRAW - 5)
@@ -1839,8 +1837,7 @@ gnome_canvas_class_init (GnomeCanvasClass *class)
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GnomeCanvasClass, draw_background),
- NULL, NULL,
- gnome_canvas_marshal_VOID__BOXED_INT_INT_INT_INT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 5, CAIRO_GOBJECT_TYPE_CONTEXT,
G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
@@ -3320,8 +3317,7 @@ gnome_canvas_item_class_init (GnomeCanvasItemClass *class)
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GnomeCanvasItemClass, event),
- boolean_handled_accumulator, NULL,
- gnome_canvas_marshal_BOOLEAN__BOXED,
+ boolean_handled_accumulator, NULL, NULL,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);