Another libbonoboui build fix

[Peter Williams <peter newton cx>]

Hi everyone,

	The attached patch fixes glib-object.h includes in libbonoboui, as well
as the xoffset/yoffset changes that Rodrigo also sent a patch for. May I
commit?

	Thanks,
		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

? gobject-offset.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.179
diff -u -r1.179 ChangeLog
--- ChangeLog	2001/11/15 06:40:45	1.179
+++ ChangeLog	2001/11/18 23:19:45
@@ -1,3 +1,21 @@
+2001-11-18  Peter Williams  <peterw ximian com>
+
+	* bonobo/bonobo-ui-marshal-main.c: Same.
+
+	* bonobo/bonobo-ui-xml.c: See below.
+
+	* bonobo/bonobo-ui-engine.c: Include glib-object.h instead of gobject/gsignal.h
+
+	* bonobo/bonobo-ui-component.c: Remove a double-include of bonobo-types.h
+
+	* bonobo/bonobo-ui-xml.h: Include glib-object.h instead of gobject/gobject.h
+
+	* bonobo/bonobo-canvas-item.c (prepare_state): See below.
+
+	* bonobo/bonobo-canvas-component.c (restore_state): Don't
+	try to set the xoffset / yoffset members of GtkLayout;
+	they've been removed.
+
 2001-11-15  Michael Meeks  <michael ximian com>
 
 	* tests/control/test-control.c (run_tests): beef up
Index: bonobo/bonobo-canvas-component.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-canvas-component.c,v
retrieving revision 1.42
diff -u -r1.42 bonobo-canvas-component.c
--- bonobo/bonobo-canvas-component.c	2001/11/04 23:09:31	1.42
+++ bonobo/bonobo-canvas-component.c	2001/11/18 23:19:45
@@ -132,8 +132,6 @@
 	item->canvas->scroll_y1 = state->canvas_scroll_y1;
 	item->canvas->zoom_xofs = state->zoom_xofs;
 	item->canvas->zoom_yofs = state->zoom_yofs;
-	GTK_LAYOUT (item->canvas)->xoffset = state->xoffset;
-	GTK_LAYOUT (item->canvas)->yoffset = state->yoffset;
 }
 
 /* This is copied from gnome-canvas.c since it is declared static */
Index: bonobo/bonobo-canvas-item.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-canvas-item.c,v
retrieving revision 1.31
diff -u -r1.31 bonobo-canvas-item.c
--- bonobo/bonobo-canvas-item.c	2001/11/04 23:09:31	1.31
+++ bonobo/bonobo-canvas-item.c	2001/11/18 23:19:46
@@ -153,8 +153,6 @@
 	target->canvas_scroll_y1 = canvas->scroll_y1;
 	target->zoom_xofs = canvas->zoom_xofs;
 	target->zoom_yofs = canvas->zoom_yofs;
-	target->xoffset   = GTK_LAYOUT (canvas)->xoffset;
-	target->yoffset   = GTK_LAYOUT (canvas)->yoffset;
 }
 
 static void
Index: bonobo/bonobo-ui-component.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-component.c,v
retrieving revision 1.72
diff -u -r1.72 bonobo-ui-component.c
--- bonobo/bonobo-ui-component.c	2001/11/15 06:40:47	1.72
+++ bonobo/bonobo-ui-component.c	2001/11/18 23:19:46
@@ -16,7 +16,6 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-ui-marshal.h>
-#include <bonobo/bonobo-types.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
Index: bonobo/bonobo-ui-component.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-component.h,v
retrieving revision 1.33
diff -u -r1.33 bonobo-ui-component.h
--- bonobo/bonobo-ui-component.h	2001/11/04 23:09:31	1.33
+++ bonobo/bonobo-ui-component.h	2001/11/18 23:19:46
@@ -10,7 +10,7 @@
 #ifndef _BONOBO_UI_COMPONENT_H_
 #define _BONOBO_UI_COMPONENT_H_
 
-#include <gobject/gclosure.h>
+#include <glib-object.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-ui-node.h>
 
Index: bonobo/bonobo-ui-engine.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-engine.c,v
retrieving revision 1.32
diff -u -r1.32 bonobo-ui-engine.c
--- bonobo/bonobo-ui-engine.c	2001/11/07 01:52:06	1.32
+++ bonobo/bonobo-ui-engine.c	2001/11/18 23:19:46
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-ui-xml.h>
Index: bonobo/bonobo-ui-marshal-main.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-marshal-main.c,v
retrieving revision 1.1
diff -u -r1.1 bonobo-ui-marshal-main.c
--- bonobo/bonobo-ui-marshal-main.c	2001/08/18 21:13:40	1.1
+++ bonobo/bonobo-ui-marshal-main.c	2001/11/18 23:19:46
@@ -1,6 +1,4 @@
-#include <gobject/gclosure.h>
-#include <gobject/gvaluetypes.h>
-#include <gobject/genums.h>
+#include <glib-object.h>
 
 #include "bonobo-ui-marshal.h"
 #include "bonobo-ui-marshal.c"
Index: bonobo/bonobo-ui-xml.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-xml.c,v
retrieving revision 1.63
diff -u -r1.63 bonobo-ui-xml.c
--- bonobo/bonobo-ui-xml.c	2001/11/07 01:52:06	1.63
+++ bonobo/bonobo-ui-xml.c	2001/11/18 23:19:46
@@ -9,7 +9,7 @@
  */
 #include "config.h"
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <bonobo/bonobo-ui-xml.h>
 #include <bonobo/bonobo-ui-marshal.h>
 #include <bonobo/bonobo-ui-node-private.h>
Index: bonobo/bonobo-ui-xml.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-xml.h,v
retrieving revision 1.25
diff -u -r1.25 bonobo-ui-xml.h
--- bonobo/bonobo-ui-xml.h	2001/10/29 10:36:43	1.25
+++ bonobo/bonobo-ui-xml.h	2001/11/18 23:19:46
@@ -10,7 +10,7 @@
 #ifndef _BONOBO_UI_XML_H_
 #define _BONOBO_UI_XML_H_
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <bonobo/bonobo-ui-node.h>
 #include <bonobo/bonobo-ui-engine.h>