PATCH (OK to commit?) -- fix "Only <glib-object.h> can be included directly." problems in various modules

[Miles Lane <miles megapathdsl net>]

Please review this patch.  Thanks.

--- gconf/gconf/gconf-client.h.orig	Sat Nov 17 21:33:58 2001
+++ gconf/gconf/gconf-client.h	Sat Nov 17 21:34:24 2001
@@ -21,7 +21,7 @@
 #ifndef GCONF_GCONF_CLIENT_H
 #define GCONF_GCONF_CLIENT_H
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-listeners.h>
 #include <gconf/gconf-changeset.h>
--- gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.h.orig	Sat Nov 17 22:02:39 2001
+++ gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.h	Sat Nov 17 21:59:06 2001
@@ -25,7 +25,7 @@
 #ifndef GNOME_VFS_MIME_MONITOR_H
 #define GNOME_VFS_MIME_MONITOR_H
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS

diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-event-source.c libbonobo/bonobo/bonobo-event-source.c
--- libbonobo.orig/bonobo/bonobo-event-source.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-event-source.c	Sat Nov 17 21:43:54 2001
@@ -12,7 +12,7 @@
 #include <config.h>
 #include <time.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-event-source.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-generic-factory.c libbonobo/bonobo/bonobo-generic-factory.c
--- libbonobo.orig/bonobo/bonobo-generic-factory.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-generic-factory.c	Sat Nov 17 21:44:27 2001
@@ -16,7 +16,7 @@
  */
 #include <config.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/Bonobo.h>
 #include <bonobo/bonobo-main.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-item-container.c libbonobo/bonobo/bonobo-item-container.c
--- libbonobo.orig/bonobo/bonobo-item-container.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-item-container.c	Sat Nov 17 21:44:54 2001
@@ -16,7 +16,7 @@
  * Copyright 1999, 2000 Ximian, Inc.
  */
 #include <config.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-main.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-item-handler.c libbonobo/bonobo/bonobo-item-handler.c
--- libbonobo.orig/bonobo/bonobo-item-handler.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-item-handler.c	Sat Nov 17 21:45:19 2001
@@ -8,7 +8,7 @@
  * Copyright 2000 Miguel de Icaza.
  */
 #include <config.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-listener.c libbonobo/bonobo/bonobo-listener.c
--- libbonobo.orig/bonobo/bonobo-listener.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-listener.c	Sat Nov 17 21:45:44 2001
@@ -11,7 +11,7 @@
 #include <config.h>
 #include <string.h>
 
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gvaluetypes.h>
 
 #include <bonobo/bonobo-exception.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-main.h libbonobo/bonobo/bonobo-main.h
--- libbonobo.orig/bonobo/bonobo-main.h	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-main.h	Sat Nov 17 21:42:48 2001
@@ -13,7 +13,7 @@
 #ifndef __LIBBONOBO_MAIN_H__
 #define __LIBBONOBO_MAIN_H__
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <bonobo/Bonobo.h>
 
 gboolean                    bonobo_is_initialized        (void);
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-moniker-context.c libbonobo/bonobo/bonobo-moniker-context.c
--- libbonobo.orig/bonobo/bonobo-moniker-context.c	Sat Nov 17 21:39:46 2001
+++ libbonobo/bonobo/bonobo-moniker-context.c	Sat Nov 17 21:38:33 2001
@@ -8,7 +8,7 @@
  * Copyright (C) 2000, Ximian, Inc.
  */
 #include <config.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-moniker-util.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-object.c libbonobo/bonobo/bonobo-object.c
--- libbonobo.orig/bonobo/bonobo-object.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-object.c	Sat Nov 17 21:46:25 2001
@@ -12,7 +12,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/Bonobo.h>
 #include <bonobo/bonobo-exception.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-persist-file.c libbonobo/bonobo/bonobo-persist-file.c
--- libbonobo.orig/bonobo/bonobo-persist-file.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-persist-file.c	Sat Nov 17 21:46:48 2001
@@ -9,7 +9,7 @@
  */
 #include "config.h"
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-persist-file.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-persist-stream.c libbonobo/bonobo/bonobo-persist-stream.c
--- libbonobo.orig/bonobo/bonobo-persist-stream.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-persist-stream.c	Sat Nov 17 21:47:09 2001
@@ -9,7 +9,7 @@
  * Copyright 1999 Ximian, Inc.
  */
 #include <config.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-persist-stream.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-persist.c libbonobo/bonobo/bonobo-persist.c
--- libbonobo.orig/bonobo/bonobo-persist.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-persist.c	Sat Nov 17 21:47:31 2001
@@ -9,7 +9,7 @@
  */
 #include <config.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/bonobo-persist.h>
 
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-running-context.c libbonobo/bonobo/bonobo-running-context.c
--- libbonobo.orig/bonobo/bonobo-running-context.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-running-context.c	Sat Nov 17 21:48:42 2001
@@ -10,7 +10,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <glib/gmain.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 
 #include <bonobo/bonobo-context.h>
 #include <bonobo/bonobo-exception.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-shlib-factory.c libbonobo/bonobo/bonobo-shlib-factory.c
--- libbonobo.orig/bonobo/bonobo-shlib-factory.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-shlib-factory.c	Sat Nov 17 21:48:06 2001
@@ -14,7 +14,7 @@
  * Copyright 1999, 2001 Ximian, Inc.
  */
 #include <config.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <gobject/gmarshal.h>
 #include <bonobo/Bonobo.h>
 #include <bonobo/bonobo-main.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-shlib-factory.h libbonobo/bonobo/bonobo-shlib-factory.h
--- libbonobo.orig/bonobo/bonobo-shlib-factory.h	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-shlib-factory.h	Sat Nov 17 21:52:01 2001
@@ -11,7 +11,7 @@
 #define _BONOBO_SHLIB_FACTORY_H_
 

-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <bonobo/Bonobo.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
diff -u --recursive --new-file libbonobo.orig/bonobo/bonobo-types.c libbonobo/bonobo/bonobo-types.c
--- libbonobo.orig/bonobo/bonobo-types.c	Sat Nov 17 21:39:43 2001
+++ libbonobo/bonobo/bonobo-types.c	Sat Nov 17 21:50:33 2001
@@ -1,7 +1,6 @@
 #include <config.h>
 #include <string.h>
-#include <gobject/gvalue.h>
-#include <gobject/gvaluearray.h>
+#include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 #include <gobject/gobject.h>
 #include <gobject/genums.h>
diff -u --recursive --new-file libbonobo.orig/tests/test-properties-server.c libbonobo/tests/test-properties-server.c
--- libbonobo.orig/tests/test-properties-server.c	Sat Nov 17 21:39:49 2001
+++ libbonobo/tests/test-properties-server.c	Sat Nov 17 21:53:03 2001
@@ -1,7 +1,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <gobject/gsignal.h>
+#include <glib-object.h>
 #include <libbonobo.h>
 
 CORBA_ORB	    orb; 
--- linc/include/linc/linc-types.h.orig	Sat Nov 17 20:50:38 2001
+++ linc/include/linc/linc-types.h	Sat Nov 17 20:49:54 2001
@@ -14,7 +14,7 @@
 
 #include <glib/gmacros.h>
 #include <glib/gthread.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS

diff -u --recursive --new-file libglade.orig/tests/test-libglade-gtk-noupgrade.c libglade/tests/test-libglade-gtk-noupgrade.c
--- libglade.orig/tests/test-libglade-gtk-noupgrade.c	Sat Nov 17 22:10:42 2001
+++ libglade/tests/test-libglade-gtk-noupgrade.c	Sat Nov 17 22:11:41 2001
@@ -1,6 +1,6 @@
 
 #include <glib/gmessages.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <gtk/gtkmain.h>
 #include <glade/glade-xml.h>
 
diff -u --recursive --new-file libglade.orig/tests/test-libglade-gtk.c libglade/tests/test-libglade-gtk.c
--- libglade.orig/tests/test-libglade-gtk.c	Sat Nov 17 22:10:42 2001
+++ libglade/tests/test-libglade-gtk.c	Sat Nov 17 22:11:11 2001
@@ -1,6 +1,6 @@
 
 #include <glib/gmessages.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
 #include <gtk/gtkmain.h>
 #include <glade/glade-xml.h>
 
diff -u --recursive --new-file libgnome.orig/libgnome/gnome-program.h libgnome/libgnome/gnome-program.h
--- libgnome.orig/libgnome/gnome-program.h	Sat Nov 17 22:18:06 2001
+++ libgnome/libgnome/gnome-program.h	Sat Nov 17 22:25:22 2001
@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 

 G_BEGIN_DECLS
diff -u --recursive --new-file libgnome.orig/libgnome/libgnometypebuiltins.c libgnome/libgnome/libgnometypebuiltins.c
--- libgnome.orig/libgnome/libgnometypebuiltins.c	Sat Nov 17 22:18:06 2001
+++ libgnome/libgnome/libgnometypebuiltins.c	Sat Nov 17 22:25:48 2001
@@ -1,7 +1,7 @@
 
 /* Generated data (by glib-mkenums) */
 
-#include <gobject/genums.h>
+#include <glib-object.h>
 #include "libgnometypebuiltins.h"