[sodipodi] A bunch of signal type corrections while fixing the x64 crash with FT2

[Hans Breuer <hans src gnome org>]

commit 1e72614e7f4aa7f0e1f82a1e14bca707d10ed5cd
Author: Hans Breuer <hans breuer org>
Date:   Sat Apr 18 18:00:50 2009 +0200

    A bunch of signal type corrections while fixing the x64 crash with FT2
---
 src/helper/sp-canvas.c      |    2 +-
 src/helper/sp-marshal.list  |    1 +
 src/knot.c                  |    2 +-
 src/libnrtype/nr-type-xft.c |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/helper/sp-canvas.c b/src/helper/sp-canvas.c
index c44fe03..6e5adef 100644
--- a/src/helper/sp-canvas.c
+++ b/src/helper/sp-canvas.c
@@ -122,7 +122,7 @@ sp_canvas_item_class_init (SPCanvasItemClass *klass)
 						 G_SIGNAL_RUN_LAST,
 						 G_STRUCT_OFFSET (SPCanvasItemClass, event),
 						 NULL, NULL,
-						 sp_marshal_BOOLEAN__POINTER,
+						 sp_marshal_BOOLEAN__BOXED,
 						 G_TYPE_BOOLEAN, 1,
 						 GDK_TYPE_EVENT);
 
diff --git a/src/helper/sp-marshal.list b/src/helper/sp-marshal.list
index 503eaeb..3e8ec5f 100644
--- a/src/helper/sp-marshal.list
+++ b/src/helper/sp-marshal.list
@@ -16,6 +16,7 @@ NONE:OBJECT,OBJECT,OBJECT
 NONE:BOXED
 BOOLEAN:NONE
 BOOLEAN:UINT
+BOOLEAN:BOXED
 BOOLEAN:POINTER
 BOOLEAN:POINTER,UINT
 BOOLEAN:POINTER,POINTER
diff --git a/src/knot.c b/src/knot.c
index cf69a21..881374e 100644
--- a/src/knot.c
+++ b/src/knot.c
@@ -224,7 +224,7 @@ sp_knot_class_init (SPKnotClass * klass)
 					    G_SIGNAL_RUN_LAST,
 					    G_STRUCT_OFFSET (SPKnotClass, event),
 					    NULL, NULL,
-					    sp_marshal_BOOLEAN__POINTER,
+					    sp_marshal_BOOLEAN__BOXED,
 					    G_TYPE_BOOLEAN, 1,
 					    GDK_TYPE_EVENT);
 	knot_signals[CLICKED] = g_signal_new ("clicked",
diff --git a/src/libnrtype/nr-type-xft.c b/src/libnrtype/nr-type-xft.c
index 606310b..70ec5ed 100644
--- a/src/libnrtype/nr-type-xft.c
+++ b/src/libnrtype/nr-type-xft.c
@@ -120,7 +120,7 @@ nr_type_xft_init (void)
 
 	/* Get family list */
 #ifdef WITH_FONTCONFIG
-	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, 0);
+	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, NULL);
 	fs = FcFontList (cfg, pat, obj);
 	FcObjectSetDestroy (obj);
 #else
@@ -142,7 +142,7 @@ nr_type_xft_init (void)
 
 	/* Get typeface list */
 #ifdef WITH_FONTCONFIG
-	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, FC_WEIGHT, FC_SLANT, FC_FILE, FC_INDEX, 0);
+	obj = FcObjectSetBuild (FC_SCALABLE, FC_OUTLINE, FC_FAMILY, FC_WEIGHT, FC_SLANT, FC_FILE, FC_INDEX, NULL);
 	NRXftPatterns = FcFontList (cfg, pat, obj);
 	FcObjectSetDestroy (obj);
 #else