Clean up #includes. Replace <gnome.h>, <bonobo.h> and <gtk/gtk.h> with

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

	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
	<gtk/gtk.h> with more finegrained headers where needed.

svn path=/trunk/; revision=9026

11 files changed, 36 insertions, 23 deletions

diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c
index 1df0462b7d..777a3cb617 100644
--- a/addressbook/contact-editor/e-contact-editor-address.c
+++ b/addressbook/contact-editor/e-contact-editor-address.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
 #include <e-contact-editor-address.h>
 
diff --git a/addressbook/contact-editor/e-contact-editor-address.h b/addressbook/contact-editor/e-contact-editor-address.h
index 95fe8bf865..48d88aab85 100644
--- a/addressbook/contact-editor/e-contact-editor-address.h
+++ b/addressbook/contact-editor/e-contact-editor-address.h
@@ -21,7 +21,7 @@
 #ifndef __E_CONTACT_EDITOR_ADDRESS_H__
 #define __E_CONTACT_EDITOR_ADDRESS_H__
 
-#include <gnome.h>
+#include <libgnomeui/gnome-dialog.h>
 #include <glade/glade.h>
 #include <ebook/e-card.h>
 
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c
index 0fb7fb57d0..69477d3325 100644
--- a/addressbook/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/contact-editor/e-contact-editor-fullname.c
@@ -21,9 +21,9 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
+#include "e-contact-editor-fullname.h"
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
 static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h
index b9138da324..70bb793d0a 100644
--- a/addressbook/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/contact-editor/e-contact-editor-fullname.h
@@ -21,7 +21,7 @@
 #ifndef __E_CONTACT_EDITOR_FULLNAME_H__
 #define __E_CONTACT_EDITOR_FULLNAME_H__
 
-#include <gnome.h>
+#include <libgnomeui/gnome-dialog.h>
 #include <glade/glade.h>
 #include <ebook/e-card.h>
 
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 2edee284f4..81d626c40b 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -21,19 +21,21 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
+#include <bonobo/bonobo-ui-container.h>
+#include <bonobo/bonobo-ui-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
 #include <gal/widgets/e-categories.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
+#include <addressbook/printing/e-contact-print.h>
+#include <addressbook/printing/e-contact-print-envelope.h>
+#include <e-util/e-gui-utils.h>
+
+#include "e-contact-editor.h"
+#include "e-contact-editor-fullname.h"
+#include "e-contact-editor-address.h"
+#include "e-contact-save-as.h"
 
 /* Signal IDs */
 enum {
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
index 184829b64c..64d7571ede 100644
--- a/addressbook/contact-editor/e-contact-editor.h
+++ b/addressbook/contact-editor/e-contact-editor.h
@@ -21,11 +21,11 @@
 #ifndef __E_CONTACT_EDITOR_H__
 #define __E_CONTACT_EDITOR_H__
 
-#include <gnome.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <bonobo/bonobo-ui-component.h>
 #include <glade/glade.h>
-#include <bonobo.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
+#include <addressbook/backend/ebook/e-card.h>
+#include <addressbook/backend/ebook/e-card-simple.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/contact-editor/e-contact-quick-add.c b/addressbook/contact-editor/e-contact-quick-add.c
index 81cd6b7cea..0ab39701d3 100644
--- a/addressbook/contact-editor/e-contact-quick-add.c
+++ b/addressbook/contact-editor/e-contact-quick-add.c
@@ -27,7 +27,15 @@
 
 #include <config.h>
 #include <ctype.h>
-#include <gnome.h>
+#include <glib.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtktable.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-stock.h>
 #include <addressbook/backend/ebook/e-book.h>
 #include <addressbook/backend/ebook/e-book-util.h>
 #include <addressbook/backend/ebook/e-card.h>
diff --git a/addressbook/contact-editor/e-contact-quick-add.h b/addressbook/contact-editor/e-contact-quick-add.h
index 9d928e43f4..81e3fdaab5 100644
--- a/addressbook/contact-editor/e-contact-quick-add.h
+++ b/addressbook/contact-editor/e-contact-quick-add.h
@@ -28,7 +28,6 @@
 #ifndef __E_CONTACT_QUICK_ADD_H__
 #define __E_CONTACT_QUICK_ADD_H__
 
-#include <gtk/gtk.h>
 #include <addressbook/backend/ebook/e-card.h>
 
 typedef void (*EContactQuickAddCallback) (ECard *new_card, gpointer user_data);
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
index 5a88c31ffa..5381fb8b2d 100644
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ b/addressbook/contact-editor/e-contact-save-as.c
@@ -20,10 +20,12 @@
  */
 
 #include <config.h>
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtksignal.h>
+#include <gal/util/e-util.h>
+#include "e-contact-save-as.h"
 
 typedef struct {
 	GtkFileSelection *filesel;
diff --git a/addressbook/contact-editor/e-contact-save-as.h b/addressbook/contact-editor/e-contact-save-as.h
index d1c84dc596..d304d4d558 100644
--- a/addressbook/contact-editor/e-contact-save-as.h
+++ b/addressbook/contact-editor/e-contact-save-as.h
@@ -21,7 +21,6 @@
 #ifndef __E_CONTACT_SAVE_AS_H__
 #define __E_CONTACT_SAVE_AS_H__
 
-#include <gnome.h>
 #include <glade/glade.h>
 #include "addressbook/backend/ebook/e-card.h"
 #include "addressbook/backend/ebook/e-card-simple.h"
diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c
index 8a6920107b..22c871c693 100644
--- a/addressbook/contact-editor/test-editor.c
+++ b/addressbook/contact-editor/test-editor.c
@@ -22,7 +22,10 @@
 
 #include "config.h"
 
-#include <gnome.h>
+#include <stdlib.h>
+#include <gtk/gtkmain.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
 #include <glade/glade.h>
 #include "e-contact-editor.h"