Clean up includes. Remove/replace <gnome.h>, <bonobo.h> and <gtk/gtk.h>.

2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>

	* *.*: Clean up includes. Remove/replace <gnome.h>, <bonobo.h>
	and <gtk/gtk.h>.

svn path=/trunk/; revision=9027

23 files changed, 40 insertions, 33 deletions

diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 8911e7154b..2f3a585d6b 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* *.*: Clean up includes. Remove/replace <gnome.h>, <bonobo.h>
+	and <gtk/gtk.h>.
+	
 2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
 
 	* component/component-factory.c (factory_fn): Specify a NULL
diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
index 4ffa7f4d00..8d1a2eb5fb 100644
--- a/executive-summary/component/e-summary-callbacks.c
+++ b/executive-summary/component/e-summary-callbacks.c
@@ -36,11 +36,11 @@
 
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>
-#include <e-summary-callbacks.h>
 #include <gtkhtml/gtkhtml.h>
 #include <e-util/e-html-utils.h>
 
 #include "e-summary.h"
+#include "e-summary-callbacks.h"
 
 #include "Composer.h"
 
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 444c8e8558..e94ebaaec1 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -26,15 +26,17 @@
 #include <config.h>
 #endif
 
+#include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-ui-util.h>
 
 #include <liboaf/liboaf.h>
 
-#include "gal/util/e-util.h"
-#include "e-util/e-gui-utils.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gal/util/e-util.h>
+#include <e-util/e-gui-utils.h>
 
 #include "e-summary-factory.h"
 
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
index a983da39b8..53dcea9488 100644
--- a/executive-summary/component/e-summary-util.c
+++ b/executive-summary/component/e-summary-util.c
@@ -23,6 +23,7 @@
 
 #include <e-summary-util.h>
 
+#include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index 0e5d613ad8..64866318ac 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -25,11 +25,17 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-event-source.h>
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-property-control.h>
+#include <bonobo/bonobo-storage.h>
+#include <bonobo/bonobo-stream-client.h>
 
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
index 0834802da1..e5e45632f1 100644
--- a/executive-summary/component/main.c
+++ b/executive-summary/component/main.c
@@ -25,8 +25,10 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-init.h>
 #include <bonobo/bonobo-main.h>
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
index 145e385c1a..b28fbc38ad 100644
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ b/executive-summary/evolution-services/executive-summary-client.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include "Executive-Summary.h"
diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h
index c6c138dd69..da43a560bf 100644
--- a/executive-summary/evolution-services/executive-summary-client.h
+++ b/executive-summary/evolution-services/executive-summary-client.h
@@ -24,7 +24,7 @@
 #ifndef _EXECUTIVE_SUMMARY_CLIENT_H__
 #define _EXECUTIVE_SUMMARY_CLIENT_H__
 
-#include <bonobo.h>
+#include <bonobo/bonobo-object.h>
 #include <evolution-services/executive-summary-component.h>
 
 #define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
index 33225e7d98..ecd4c0d1e9 100644
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ b/executive-summary/evolution-services/executive-summary-component-client.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include <liboaf/liboaf.h>
diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h
index b98aa9e7e5..5f1f702550 100644
--- a/executive-summary/evolution-services/executive-summary-component-client.h
+++ b/executive-summary/evolution-services/executive-summary-component-client.h
@@ -24,7 +24,7 @@
 #ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
 #define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
 
-#include <bonobo.h>
+#include <bonobo/bonobo-object.h>
 #include <evolution-services/executive-summary.h>
 #include <evolution-services/executive-summary-component-view.h>
 
diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.c b/executive-summary/evolution-services/executive-summary-component-factory-client.c
index 19114bfa6f..5b10f9ed1a 100644
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.c
+++ b/executive-summary/evolution-services/executive-summary-component-factory-client.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include <liboaf/liboaf.h>
diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.h b/executive-summary/evolution-services/executive-summary-component-factory-client.h
index 8ab4a05672..80b4400c82 100644
--- a/executive-summary/evolution-services/executive-summary-component-factory-client.h
+++ b/executive-summary/evolution-services/executive-summary-component-factory-client.h
@@ -24,7 +24,7 @@
 #ifndef _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__
 #define _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__
 
-#include <bonobo.h>
+#include <bonobo/bonobo-object-client.h>
 
 #define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())
 #define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))
diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c
index 6ba24e143c..a5600caf6d 100644
--- a/executive-summary/evolution-services/executive-summary-component-view.c
+++ b/executive-summary/evolution-services/executive-summary-component-view.c
@@ -26,8 +26,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include <evolution-services/executive-summary-component.h>
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
index b3b1e63215..c1fbf4f02b 100644
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ b/executive-summary/evolution-services/executive-summary-component.c
@@ -26,8 +26,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include "Executive-Summary.h"
diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h
index 9e09fea4a4..8db4c1d9b8 100644
--- a/executive-summary/evolution-services/executive-summary-component.h
+++ b/executive-summary/evolution-services/executive-summary-component.h
@@ -25,7 +25,7 @@
 #define _EXECUTIVE_SUMMARY_COMPONENT_H__
 
 #include <gtk/gtksignal.h>
-#include <bonobo.h>
+#include <bonobo/bonobo-object.h>
 
 #define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
 #define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
diff --git a/executive-summary/evolution-services/executive-summary-html-view.c b/executive-summary/evolution-services/executive-summary-html-view.c
index 45f2e86c16..d5ddb54244 100644
--- a/executive-summary/evolution-services/executive-summary-html-view.c
+++ b/executive-summary/evolution-services/executive-summary-html-view.c
@@ -26,9 +26,8 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
+#include <gtk/gtksignal.h>
 #include <bonobo/bonobo-event-source.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include "Executive-Summary.h"
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
index 868584ad52..89731ea69e 100644
--- a/executive-summary/evolution-services/executive-summary.c
+++ b/executive-summary/evolution-services/executive-summary.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-#include <gnome.h>
 #include <gal/util/e-util.h>
 
 #include "Executive-Summary.h"
diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
index 3134990810..e0ea671ce8 100644
--- a/executive-summary/test-service/main.c
+++ b/executive-summary/test-service/main.c
@@ -26,9 +26,9 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-#include <bonobo.h>
-
+#include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-persist-stream.h>
+#include <bonobo/bonobo-property-bag.h>
 #include <evolution-services/executive-summary-component.h>
 #include <evolution-services/executive-summary-html-view.h>
 
diff --git a/executive-summary/test-service/rdf-summary.c b/executive-summary/test-service/rdf-summary.c
index b99d939c11..876dae97a4 100644
--- a/executive-summary/test-service/rdf-summary.c
+++ b/executive-summary/test-service/rdf-summary.c
@@ -15,11 +15,14 @@
 #endif
  
 #include <glib.h>
-#include <gnome.h>
-#include <bonobo.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 
+#include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-persist-stream.h>
+#include <bonobo/bonobo-property.h>
+#include <bonobo/bonobo-property-bag.h>
+#include <bonobo/bonobo-property-control.h>
 #include <evolution-services/executive-summary-component.h>
 #include <evolution-services/executive-summary-html-view.h>
 #include <liboaf/liboaf.h>
diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c
index bf5bcb1eba..961fbd7ac4 100644
--- a/executive-summary/widgets/e-summary-subwindow.c
+++ b/executive-summary/widgets/e-summary-subwindow.c
@@ -25,13 +25,13 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-font.h>
 
 #include <gal/e-text/e-text.h>
 
 #include "e-summary-subwindow.h"
+#include "e-summary-titlebar.h"
 
 #define PARENT_TYPE (gnome_canvas_group_get_type ())
 #define TITLEBAR_BORDER_WIDTH 2
diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c
index 81fa8e5923..6a1992c6df 100644
--- a/executive-summary/widgets/e-summary-title-button.c
+++ b/executive-summary/widgets/e-summary-title-button.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gal/util/e-util.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c
index a5c5178a80..b79e0dc8c7 100644
--- a/executive-summary/widgets/e-summary-titlebar.c
+++ b/executive-summary/widgets/e-summary-titlebar.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-font.h>
 
diff --git a/executive-summary/widgets/esummary-window-test.c b/executive-summary/widgets/esummary-window-test.c
index 3a0ad0ab6b..7928e8b6f9 100644
--- a/executive-summary/widgets/esummary-window-test.c
+++ b/executive-summary/widgets/esummary-window-test.c
@@ -1,8 +1,10 @@
-#include <gnome.h>
 #include <gal/widgets/e-canvas.h>
 #include "e-summary-subwindow.h"
 #include "e-summary-titlebar.h"
 
+
+void close_test (GtkWidget *widget, gpointer data);
+
 void
 close_test (GtkWidget *widget,
 	    gpointer data)