Yet another marshaller / glib-object path: libgnomecanvas

[Peter Williams <peter newton cx>]

Hi everyone,
	
	This patch to libgnomecanvas fixes build problems related to the
glib-object.h change and the marshaller privitization. Whoever's in
charge (I couldn't tell from the ChangeLog), may I commit?

	Peter

-- 
Peter Williams     peter newton cx / peterw ximian com

"Why should I have to change my name? He's the one who 
sucks!"                              -- Michael Bolton

? marshal-object.diff
Index: libgnomecanvas/ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/ChangeLog,v
retrieving revision 1.91
diff -u -r1.91 ChangeLog
--- libgnomecanvas/ChangeLog	2001/11/18 16:12:25	1.91
+++ libgnomecanvas/ChangeLog	2001/11/18 21:01:54
@@ -1,3 +1,13 @@
+2001-11-18  Peter Williams  <peterw ximian com>
+
+	* libgnomecanvastypes.c: <glib/gboxed.h> -> <glib-object.h>
+
+	* gnome-canvas.c (gnome_canvas_item_class_init): 
+	Change gtk_marshal_BOOLEAN__BOXED to gnome_canvas_marshal_.
+
+	* gnome-canvas-marshal.list (BOOLEAN): Add BOOLEAN:BOXED
+	marshaller.
+
 2001-11-18  Alexander Larsson  <alla lysator liu se>
 
 	* gnome-canvas-text.c (gnome_canvas_text_set_property):
Index: libgnomecanvas/gnome-canvas-marshal.list
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-marshal.list,v
retrieving revision 1.1
diff -u -r1.1 gnome-canvas-marshal.list
--- libgnomecanvas/gnome-canvas-marshal.list	2001/08/13 17:27:20	1.1
+++ libgnomecanvas/gnome-canvas-marshal.list	2001/11/18 21:01:54
@@ -1 +1,2 @@
 VOID:OBJECT,INT,INT,INT,INT
+BOOLEAN:BOXED
Index: libgnomecanvas/gnome-canvas.c
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas.c,v
retrieving revision 1.135
diff -u -r1.135 gnome-canvas.c
--- libgnomecanvas/gnome-canvas.c	2001/11/05 23:18:42	1.135
+++ libgnomecanvas/gnome-canvas.c	2001/11/18 21:01:54
@@ -202,7 +202,7 @@
 				GTK_RUN_LAST,
 				GTK_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, event),
-				gtk_marshal_BOOLEAN__BOXED,
+				gnome_canvas_marshal_BOOLEAN__BOXED,
 				GTK_TYPE_BOOL, 1,
 				GDK_TYPE_EVENT);
         item_signals[ITEM_BUTTON_PRESS_EVENT] =
@@ -210,7 +210,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, button_press_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -219,7 +219,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, button_release_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -228,7 +228,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, motion_notify_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -237,7 +237,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, key_press_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -246,7 +246,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, key_release_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -255,7 +255,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, enter_notify_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
@@ -264,7 +264,7 @@
                                 GTK_RUN_LAST,
                                 GTK_CLASS_TYPE (object_class),
                                 GTK_SIGNAL_OFFSET (GnomeCanvasItemClass, leave_notify_event),
-                                gtk_marshal_BOOLEAN__BOXED,
+                                gnome_canvas_marshal_BOOLEAN__BOXED,
                                 GTK_TYPE_BOOL, 1,
                                 GDK_TYPE_EVENT);
 
Index: libgnomecanvas/libgnomecanvastypes.c
===================================================================
RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/libgnomecanvastypes.c,v
retrieving revision 1.10
diff -u -r1.10 libgnomecanvastypes.c
--- libgnomecanvas/libgnomecanvastypes.c	2001/09/10 17:08:37	1.10
+++ libgnomecanvas/libgnomecanvastypes.c	2001/11/18 21:01:54
@@ -24,7 +24,7 @@
  */
 
 #include <config.h>
-#include <gobject/gboxed.h>
+#include <glib-object.h>
 
 #include <libgnomecanvas/libgnomecanvas.h>