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

21 files changed, 101 insertions, 61 deletions

diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index a12dca8086..363f39fcdf 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
+#include <bonobo/bonobo-generic-factory.h>
 
 #include "evolution-shell-component.h"
 #include "evolution-storage.h"
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 43f34a4389..e56c1fa799 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -2,11 +2,16 @@
 
 #include <config.h>
 
-#include <gnome.h>
-#include <gtkhtml/gtkhtml.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-propertybox.h>
+#include <libgnomeui/gnome-stock.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
-#include "e-util/e-html-utils.h"
+#include <gtkhtml/gtkhtml.h>
+#include <e-util/e-html-utils.h>
 #include "addressbook-config.h"
 #include "addressbook-storage.h"
 
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
index 7078a774ef..89514d6527 100644
--- a/addressbook/gui/component/addressbook-factory.c
+++ b/addressbook/gui/component/addressbook-factory.c
@@ -9,9 +9,12 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-init.h>
 #include <liboaf/liboaf.h>
+#include <bonobo/bonobo-main.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-cursors.h>
 #include <unicode.h>
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 531e2acd7b..f09c42f980 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -50,23 +50,23 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
+#include <errno.h>
 
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 
-#include "addressbook-storage.h"
+#include <bonobo/bonobo-object.h>
 
 #include <gal/util/e-util.h>
 #include <gal/util/e-xml-utils.h>
 
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
+#include "evolution-shell-component.h"
+#include "evolution-storage.h"
+
+#include "addressbook-storage.h"
 
 #define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"
 
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 09b45a65d2..8447ac68c1 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -10,18 +10,16 @@
 
 #include <config.h>
 
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "addressbook.h"
-
-#include <ebook/e-book.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-ui-util.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-unicode.h>
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include <widgets/misc/e-search-bar.h>
 
 #include <select-names/e-select-names.h>
 #include <select-names/e-select-names-manager.h>
@@ -29,9 +27,14 @@
 #include "e-contact-editor.h"
 #include "e-contact-save-as.h"
 #include "addressbook-config.h"
-
+#include "addressbook.h"
+#include "addressbook/gui/search/e-addressbook-search-dialog.h"
+#include "addressbook/gui/widgets/e-addressbook-view.h"
 #include <addressbook/printing/e-contact-print.h>
 
+#include <ebook/e-book.h>
+#include <widgets/misc/e-search-bar.h>
+
 #define PROPERTY_FOLDER_URI          "folder_uri"
 
 #define PROPERTY_FOLDER_URI_IDX      1
diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h
index a85ed90d8b..8cf425d5c9 100644
--- a/addressbook/gui/component/e-address-widget.h
+++ b/addressbook/gui/component/e-address-widget.h
@@ -28,7 +28,10 @@
 #ifndef __E_ADDRESS_WIDGET_H__
 #define __E_ADDRESS_WIDGET_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkeventbox.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtkwidget.h>
 #include <libgnome/gnome-defs.h>
 #include <addressbook/backend/ebook/e-book.h>
 #include <addressbook/backend/ebook/e-book-util.h>
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
index 23b61d58be..007aa395d9 100644
--- a/addressbook/gui/component/e-cardlist-model.c
+++ b/addressbook/gui/component/e-cardlist-model.c
@@ -8,11 +8,10 @@
  */
 
 #include <config.h>
-#include "e-cardlist-model.h"
 #include <gnome-xml/tree.h>
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
+#include "e-cardlist-model.h"
 
 #define PARENT_TYPE e_table_model_get_type()
 
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index f21e33361f..013ab23538 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -25,19 +25,18 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
-
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-control.h>
 
-#include "Evolution-Addressbook-SelectNames.h"
-
 #include <gal/util/e-util.h>
 #include <gal/e-text/e-entry.h>
-#include "e-select-names-manager.h"
 
+#include "Evolution-Addressbook-SelectNames.h"
+
+#include "e-select-names-manager.h"
 #include "e-select-names-bonobo.h"
 
+
 
 #define PARENT_TYPE bonobo_object_get_type ()
 static BonoboObjectClass *parent_class = NULL;
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index f1087bebeb..17f4e0e790 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -26,10 +26,14 @@
  */
 
 #include <config.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
-#include <gnome.h>
+
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+
 #include <addressbook/backend/ebook/e-book-util.h>
 #include <addressbook/backend/ebook/e-destination.h>
 #include "e-select-names-completion.h"
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
index 1b97172f9e..39fdcf8cee 100644
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ b/addressbook/gui/component/select-names/e-select-names-factory.c
@@ -25,10 +25,9 @@
 #include <config.h>
 #endif
 
-#include <bonobo.h>
+#include <bonobo/bonobo-generic-factory.h>
 
 #include "e-select-names-bonobo.h"
-
 #include "e-select-names-factory.h"
 
 
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index e1718cf3a7..6c06624918 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -7,10 +7,12 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
+
+#include <gal/e-text/e-entry.h>
 
 #include "e-select-names-manager.h"
 #include "e-select-names-model.h"
@@ -18,7 +20,6 @@
 #include "e-select-names.h"
 #include "e-select-names-completion.h"
 #include "e-select-names-popup.h"
-#include <gal/e-text/e-entry.h>
 #include <addressbook/backend/ebook/e-destination.h>
 
 /* Object argument IDs */
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
index 7b68528669..4c177d1685 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ b/addressbook/gui/component/select-names/e-select-names-manager.h
@@ -9,9 +9,9 @@
 #ifndef __E_SELECT_NAMES_MANAGER_H__
 #define __E_SELECT_NAMES_MANAGER_H__
 
-#include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <time.h>
+#include <gtk/gtkobject.h>
 #include <e-util/e-list.h>
 #include "e-select-names.h"
 
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
index 939c40aa8b..5dd11496d2 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-model.c
@@ -8,14 +8,16 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
 #include <gtk/gtkmarshal.h>
+#include <gtk/gtksignal.h>
 
-#include "e-select-names-model.h"
 #include <gal/util/e-util.h>
+
+#include "e-select-names-model.h"
 #include "addressbook/backend/ebook/e-card-simple.h"
 
 #define SEPARATOR ", "
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
index 4b3413f983..9d8c66f063 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-model.h
@@ -12,7 +12,7 @@
 #define __E_SELECT_NAMES_MODEL_H__
 
 #include <time.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include <stdio.h>
 #include <e-util/e-list.h>
 #include <addressbook/backend/ebook/e-card.h>
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
index 85c2489b1a..f6164f0022 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ b/addressbook/gui/component/select-names/e-select-names-popup.c
@@ -26,8 +26,18 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
-#include <gnome.h>
+#include <string.h>
+
+#include <glib.h>
+#include <gtk/gtkcheckmenuitem.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-popup-menu.h>
+
 #include <addressbook/contact-editor/e-contact-quick-add.h>
 #include "e-select-names-popup.h"
 
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
index be1f95cc98..f0dc52bad7 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.c
@@ -10,9 +10,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
 
+#include <gtk/gtksignal.h>
 #include <gal/util/e-util.h>
+
 #include "e-select-names-table-model.h"
 #include "addressbook/backend/ebook/e-card-simple.h"
 
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
index 7a051d337c..a7feb4d9c1 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.h
@@ -10,10 +10,10 @@
 #define __E_SELECT_NAMES_TABLE_MODEL_H__
 
 #include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
-#include "e-select-names-model.h"
+#include <gtk/gtkobject.h>
 #include <gal/e-table/e-table-model.h>
+#include "e-select-names-model.h"
 
 #define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())
 #define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
index 1a1bd06b60..6aa6a75a9a 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.c
@@ -8,13 +8,14 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <gtk/gtk.h>
 
 #include <gal/e-text/e-text-model-repos.h>
+
 #include <addressbook/contact-editor/e-contact-editor.h>
 #include "e-select-names-text-model.h"
 
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h
index 6458bac59c..7a9e0a7396 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.h
@@ -11,10 +11,10 @@
 #define __E_SELECT_NAMES_TEXT_MODEL_H__
 
 #include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
-#include "e-select-names-model.h"
+#include <gtk/gtkobject.h>
 #include <gal/e-text/e-text-model.h>
+#include "e-select-names-model.h"
 
 #define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
 #define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index bb00fef6e7..cbe9624be7 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -20,17 +20,23 @@
  */
 
 #include <config.h>
-#include <gnome.h>
-#include "e-select-names.h"
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-stock.h>
+
 #include <gal/e-table/e-table-simple.h>
+#include <gal/widgets/e-font.h>
+
 #include <addressbook/gui/widgets/e-addressbook-model.h>
 #include <addressbook/gui/component/e-cardlist-model.h>
 #include <addressbook/backend/ebook/e-book.h>
+#include <addressbook/gui/component/addressbook-component.h>
+#include <shell/evolution-shell-client.h>
+
+#include "e-select-names.h"
 #include <addressbook/backend/ebook/e-card-simple.h>
 #include "e-select-names-table-model.h"
-#include <shell/evolution-shell-client.h>
-#include <addressbook/gui/component/addressbook-component.h>
-#include <gal/widgets/e-font.h>
 
 static void e_select_names_init		(ESelectNames		 *card);
 static void e_select_names_class_init	(ESelectNamesClass	 *klass);
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index 9d47558117..d059de453d 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -21,14 +21,18 @@
 #ifndef __E_SELECT_NAMES_H__
 #define __E_SELECT_NAMES_H__
 
-#include <gnome.h>
+#include <glib.h>
+#include <gtk/gtkwidget.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-dialog.h>
 #include <glade/glade.h>
-#include <e-util/e-list.h>
 #include <gal/e-table/e-table.h>
 #include <gal/e-table/e-table-scrolled.h>
-#include "e-select-names-model.h"
 
-#include <shell/evolution-storage-listener.h>
+#include "e-select-names-model.h"
+#include "e-util/e-list.h"
+#include "shell/evolution-storage-listener.h"
 
 #ifdef __cplusplus
 extern "C" {