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, 76 insertions, 48 deletions

diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
index 1c79ea5d71..aa7ead900f 100644
--- a/addressbook/backend/ebook/e-book-util.c
+++ b/addressbook/backend/ebook/e-book-util.c
@@ -26,7 +26,8 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include "e-book-util.h"
@@ -155,6 +156,8 @@ simple_query_free (SimpleQueryInfo *sq)
 	book_remove_simple_query (sq->book, sq);
 
 #ifdef USE_WORKAROUND
+	Glist *i;
+	
 	/* If we are still in the queue, remove ourselves. */
 	for (i = WORKAROUND_sq_queue; i != NULL; i = g_list_next (i)) {
 		if (i->data == sq) {
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index c603f94743..aaa46af719 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -1076,7 +1076,7 @@ e_book_get_cursor       (EBook               *book,
 
 guint
 e_book_get_book_view       (EBook                 *book,
-			    gchar                 *query,
+			    const gchar           *query,
 			    EBookBookViewCallback  cb,
 			    gpointer               closure)
 {
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
index 72efb7250c..ed635dcace 100644
--- a/addressbook/backend/ebook/e-book.h
+++ b/addressbook/backend/ebook/e-book.h
@@ -118,7 +118,7 @@ guint     e_book_get_cursor               (EBook                 *book,
 					   gpointer               closure);
 
 guint     e_book_get_book_view            (EBook                 *book,
-					   char                  *query,
+					   const gchar           *query,
 					   EBookBookViewCallback  cb,
 					   gpointer               closure);
 
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
index faf402d1e7..cccc493352 100644
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ b/addressbook/backend/ebook/e-card-cursor.c
@@ -7,7 +7,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include "addressbook.h"
 #include "e-card-cursor.h"
 
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index 1b5f0d0e0c..a4dad0ff5b 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -10,8 +10,8 @@
 #ifndef __E_CARD_CURSOR_H__
 #define __E_CARD_CURSOR_H__
 
+#include <gtk/gtkobject.h>
 #include <libgnome/gnome-defs.h>
-#include <gtk/gtk.h>
 #include <addressbook/backend/ebook/addressbook.h>
 #include <addressbook/backend/ebook/e-card.h>
 
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
index 6c398b6133..6d5619d135 100644
--- a/addressbook/backend/ebook/e-card-simple.c
+++ b/addressbook/backend/ebook/e-card-simple.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 
 #include <libversit/vcc.h>
 #include "e-card-simple.h"
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index 2fe96be18e..66d8e87db4 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -13,8 +13,8 @@
 #define __E_CARD_SIMPLE_H__
 
 #include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <gtk/gtkobject.h>
 #include <addressbook/backend/ebook/e-card.h>
 #include <addressbook/backend/ebook/e-card-types.h>
 #include <e-util/e-list.h>
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 8729652c6d..435d8fef51 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -13,17 +13,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtk.h>
+
+#include <gtk/gtkobject.h>
+#include <bonobo/bonobo-object-client.h>
+#include <gal/util/e-util.h>
 
 #include <libversit/vcc.h>
+#include "e-util/ename/e-name-western.h"
+#include "e-util/ename/e-address-western.h"
+
 #include "e-card.h"
 #include "e-card-pairs.h"
-#include <e-util/ename/e-name-western.h>
-#include <e-util/ename/e-address-western.h>
-
-#include <gal/util/e-util.h>
-
-#include <bonobo/bonobo-object-client.h>
 
 #define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
 #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index eba8c07140..5c0865ab50 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -13,7 +13,7 @@
 #define __E_CARD_H__
 
 #include <time.h>
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include <stdio.h>
 #include <addressbook/backend/ebook/e-card-types.h>
 #include <e-util/e-list.h>
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
index c1e0ad8a78..c652564442 100644
--- a/addressbook/backend/ebook/e-destination.c
+++ b/addressbook/backend/ebook/e-destination.c
@@ -26,7 +26,8 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
+#include <string.h>
+#include <gtk/gtkobject.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include "e-destination.h"
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
index 2014f8e340..618cfdb458 100644
--- a/addressbook/backend/ebook/e-destination.h
+++ b/addressbook/backend/ebook/e-destination.h
@@ -28,7 +28,7 @@
 #ifndef __E_DESTINATION_H__
 #define __E_DESTINATION_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #include <addressbook/backend/ebook/e-card.h>
 
 #define E_TYPE_DESTINATION        (e_destination_get_type ())
diff --git a/addressbook/backend/ebook/evolution-gnomecard-importer.c b/addressbook/backend/ebook/evolution-gnomecard-importer.c
index 42ab35d223..9329ab9a86 100644
--- a/addressbook/backend/ebook/evolution-gnomecard-importer.c
+++ b/addressbook/backend/ebook/evolution-gnomecard-importer.c
@@ -1,10 +1,11 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
 #include <stdio.h>
 
+#include <liboaf/liboaf.h>
+#include <bonobo/bonobo-generic-factory.h>
+#include <bonobo/bonobo-main.h>
+
 #include <e-book.h>
 
 #include <importer/evolution-importer.h>
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
index 3295854b0a..5d16a26a7c 100644
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ b/addressbook/backend/ebook/load-gnomecard-addressbook.c
@@ -1,11 +1,16 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
 #include <stdio.h>
+#include <glib.h>
+#include <gtk/gtkmain.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-init.h>
+#include <bonobo/bonobo-main.h>
+#include <liboaf/liboaf.h>
 
-#include <e-book.h>
+#include "e-book.h"
 
 static CORBA_Environment ev;
 
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
index 30fda41be4..2c18efb7c8 100644
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ b/addressbook/backend/ebook/load-pine-addressbook.c
@@ -1,12 +1,17 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
+#include <ctype.h>
 #include <stdio.h>
+#include <glib.h>
+#include <gtk/gtkmain.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-util.h>
+#include <libgnomeui/gnome-init.h>
+#include <bonobo/bonobo-main.h>
+#include <liboaf/liboaf.h>
 
-#include <e-book.h>
-#include <ctype.h>
+#include "e-book.h"
 
 static CORBA_Environment ev;
 
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
index a727dae7a3..a2f10e5aca 100644
--- a/addressbook/backend/ebook/test-card.c
+++ b/addressbook/backend/ebook/test-card.c
@@ -1,4 +1,6 @@
-#include <gnome.h>
+#include <string.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnomeui/gnome-init.h>
 #include "e-card.h"
 
 #define TEST_VCARD                   \
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
index 69422ba20e..0de62d701c 100644
--- a/addressbook/backend/ebook/test-client-list.c
+++ b/addressbook/backend/ebook/test-client-list.c
@@ -1,8 +1,13 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
+
+#include <glib.h>
+#include <gtk/gtkmain.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 "e-book.h"
 
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index 25a3cb6dc9..36115d848a 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -1,10 +1,14 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 #include <config.h>
-#include <bonobo.h>
+#include <glib.h>
+#include <gtk/gtkmain.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 <gnome.h>
 
-#include <e-book.h>
+#include "e-book.h"
 
 #define TEST_VCARD                   \
 "BEGIN:VCARD
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 775e322631..281c8f1c66 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -7,9 +7,7 @@
  */
 
 #include "config.h"  
-#include <gtk/gtksignal.h>
 #include <stdio.h>
-#include <gnome.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
@@ -23,14 +21,18 @@
 #endif
 #endif
 
-#include "pas-backend-file.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
+
 #include <ebook/e-card-simple.h>
 #include <e-util/e-sexp.h>
 #include <e-util/e-dbhash.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
+#include "pas-backend-file.h"
+#include "pas-book.h"
+#include "pas-card-cursor.h"
 
 #define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
 #define PAS_BACKEND_FILE_VERSION "0.1"
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 0fb5347ca3..2aa8a884d4 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -9,10 +9,10 @@
 #define DEBUG
 
 #include "config.h"  
-#include <gtk/gtksignal.h>
 #include <fcntl.h>
 #include <time.h>
 #include <lber.h>
+#include <gtk/gtksignal.h>
 
 #ifdef DEBUG
 #define LDAP_DEBUG
@@ -39,12 +39,13 @@
 #include "ldap_schema.h"
 #endif
 
+#include <e-util/e-sexp.h>
+#include <ebook/e-card-simple.h>
+
 #include "pas-backend-ldap.h"
 #include "pas-book.h"
 #include "pas-card-cursor.h"
 
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
 
 #define LDAP_MAX_SEARCH_RESPONSES 100
 
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 54fbd2de84..052205b81d 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -9,9 +9,9 @@
 
 #include <config.h>
 #include <ctype.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
 
+#include <gtk/gtksignal.h>
+#include <liboaf/liboaf.h>
 #include "addressbook.h"
 #include "pas-book-factory.h"
 
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
index a7f56275fc..aeb1eddd48 100644
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ b/addressbook/backend/pas/pas-card-cursor.c
@@ -7,7 +7,6 @@
  */
 
 #include <config.h>
-#include <bonobo.h>
 #include "addressbook.h"
 #include "pas-card-cursor.h"