From 3d325ba4047580cc228780c19997675626c3b7ca Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 23 Dec 2011 18:54:37 +0000 Subject: Add marshalers to all signals for mysterious unknown reasons. git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@3902 a436a847-0d15-0410-975c-d299462d15a1 --- src/Canvas.cpp | 7 +++++-- src/ganv-marshal.list | 2 ++ src/node.c | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Canvas.cpp b/src/Canvas.cpp index 38cb4ad..e057bc1 100644 --- a/src/Canvas.cpp +++ b/src/Canvas.cpp @@ -43,6 +43,7 @@ #include "ganv/node.h" #include "./color.h" +#include "./ganv-marshal.h" #include "./ganv-private.h" #ifdef HAVE_AGRAPH @@ -1845,7 +1846,8 @@ ganv_canvas_class_init(GanvCanvasClass* klass) signal_connect = g_signal_new("connect", ganv_canvas_get_type(), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, NULL, + 0, NULL, NULL, + ganv_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, ganv_node_get_type(), @@ -1855,7 +1857,8 @@ ganv_canvas_class_init(GanvCanvasClass* klass) signal_disconnect = g_signal_new("disconnect", ganv_canvas_get_type(), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, NULL, + 0, NULL, NULL, + ganv_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, ganv_node_get_type(), diff --git a/src/ganv-marshal.list b/src/ganv-marshal.list index 5ad61bf..ba6ef33 100644 --- a/src/ganv-marshal.list +++ b/src/ganv-marshal.list @@ -1,2 +1,4 @@ VOID:OBJECT,INT,INT,INT,INT BOOLEAN:BOXED +VOID:DOUBLE,DOUBLE +VOID:OBJECT,OBJECT diff --git a/src/node.c b/src/node.c index a6f9ad5..e162e04 100644 --- a/src/node.c +++ b/src/node.c @@ -19,6 +19,7 @@ #include "./boilerplate.h" #include "./color.h" +#include "./ganv-marshal.h" #include "./ganv-private.h" #include "./gettext.h" @@ -576,7 +577,8 @@ ganv_node_class_init(GanvNodeClass* class) signal_moved = g_signal_new("moved", ganv_node_get_type(), G_SIGNAL_RUN_FIRST, - 0, NULL, NULL, NULL, + 0, NULL, NULL, + ganv_marshal_VOID__DOUBLE_DOUBLE, G_TYPE_NONE, 2, G_TYPE_DOUBLE, -- cgit v1.2.1