diff options
Diffstat (limited to 'addressbook')
97 files changed, 324 insertions, 215 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 11edeb99c2..879c6353aa 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +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. + 2001-03-28 Christopher James Lahey <clahey@ximian.com> * backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes. 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" diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 907456d985..5f6fdab5bb 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -40,11 +40,11 @@ #define ADDR_CONFIG_LOAD 1 #define ADDR_CONFIG_DESTROY 1 -#include <address-conduit-config.h> +#include "address-conduit-config.h" #undef ADDR_CONFIG_LOAD #undef ADDR_CONFIG_DESTROY -#include <address-conduit.h> +#include "address-conduit.h" GnomePilotConduit * conduit_get_gpilot_conduit (guint32); void conduit_destroy_gpilot_conduit (GnomePilotConduit*); 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" 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" { diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 1df0462b7d..777a3cb617 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/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/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h index 95fe8bf865..48d88aab85 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.h +++ b/addressbook/gui/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/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 0fb7fb57d0..69477d3325 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/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/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index b9138da324..70bb793d0a 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/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/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 2edee284f4..81d626c40b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/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/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 184829b64c..64d7571ede 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/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/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 81cd6b7cea..0ab39701d3 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/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/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h index 9d928e43f4..81e3fdaab5 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.h +++ b/addressbook/gui/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/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c index 5a88c31ffa..5381fb8b2d 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.c +++ b/addressbook/gui/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/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h index d1c84dc596..d304d4d558 100644 --- a/addressbook/gui/contact-editor/e-contact-save-as.h +++ b/addressbook/gui/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/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 8a6920107b..22c871c693 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/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" diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c index f334b5e652..17399cd68c 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.c +++ b/addressbook/gui/search/e-addressbook-search-dialog.c @@ -21,11 +21,13 @@ */ #include <config.h> -#include <gnome.h> + #include <gal/widgets/e-canvas.h> +#include <gal/widgets/e-scroll-frame.h> + #include "e-addressbook-search-dialog.h" #include "addressbook/gui/widgets/e-minicard-view-widget.h" -#include <gal/widgets/e-scroll-frame.h> + static void e_addressbook_search_dialog_init (EAddressbookSearchDialog *widget); static void e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass); diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h index dc54275a77..8fcd23492d 100644 --- a/addressbook/gui/search/e-addressbook-search-dialog.h +++ b/addressbook/gui/search/e-addressbook-search-dialog.h @@ -21,7 +21,6 @@ #ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__ #define __E_ADDRESSBOOK_SEARCH_DIALOG_H__ -#include <gnome.h> #include <ebook/e-book.h> #include "filter/rule-context.h" @@ -32,6 +31,8 @@ extern "C" { #pragma } #endif /* __cplusplus */ +#include <libgnomeui/gnome-dialog.h> + #define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE (e_addressbook_search_dialog_get_type ()) #define E_ADDRESSBOOK_SEARCH_DIALOG(obj) (GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog)) #define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass)) diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 1716c0c498..71c0db892c 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -8,11 +8,11 @@ */ #include <config.h> -#include "e-addressbook-model.h" +#include <gtk/gtksignal.h> #include <gnome-xml/tree.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <gnome.h> +#include "e-addressbook-model.h" #define PARENT_TYPE e_table_model_get_type() ETableModelClass *parent_class; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index e22228023f..6229eb0ccf 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -21,9 +21,6 @@ */ #include <config.h> -#include <gnome.h> - -#include "e-addressbook-view.h" #include <gal/e-table/e-table-scrolled.h> #include <gal/e-table/e-table-model.h> @@ -37,6 +34,7 @@ #include "gal-view-factory-minicard.h" #include "gal-view-minicard.h" +#include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "e-minicard-view-widget.h" diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 7197d237e5..e481efec65 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -21,8 +21,8 @@ #ifndef __E_ADDRESSBOOK_VIEW_H__ #define __E_ADDRESSBOOK_VIEW_H__ -#include <gnome.h> -#include <bonobo.h> +#include <gtk/gtkobject.h> +#include <bonobo/bonobo-ui-component.h> #include "addressbook/backend/ebook/e-book.h" #ifdef __cplusplus diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 0efc7d69ab..ab1356d1d5 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -9,14 +9,16 @@ */ #include <config.h> -#include <gnome.h> -#include <bonobo.h> -#include "addressbook/backend/ebook/e-book.h" +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-persist.h> +#include <bonobo/bonobo-persist-stream.h> +#include <bonobo/bonobo-stream-client.h> +#include <addressbook/backend/ebook/e-book.h> +#include <addressbook/backend/ebook/e-card.h> #include "e-minicard-control.h" #include "e-minicard-widget.h" -#include "addressbook/backend/ebook/e-card.h" #if 0 enum { diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 7e3a0e511c..f04fccf860 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -21,12 +21,11 @@ */ #include <config.h> -#include <gnome.h> -#include "e-minicard-label.h" #include <gal/util/e-util.h> #include <gal/e-text/e-text.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-canvas-utils.h> +#include "e-minicard-label.h" static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index 15d3a63105..c4d7be3ec2 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -21,7 +21,8 @@ #ifndef __E_MINICARD_LABEL_H__ #define __E_MINICARD_LABEL_H__ -#include <gnome.h> +#include <glib.h> +#include <libgnomeui/gnome-canvas.h> #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index b3b326397f..851beb4684 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -21,9 +21,11 @@ */ #include <config.h> -#include <gnome.h> + #include <gal/widgets/e-canvas.h> + #include "e-minicard-view-widget.h" + static void e_minicard_view_widget_init (EMinicardViewWidget *widget); static void e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass); static void e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index b56a3d856e..e22d651826 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -21,10 +21,9 @@ #ifndef __E_MINICARD_VIEW_WIDGET_H__ #define __E_MINICARD_VIEW_WIDGET_H__ -#include <gnome.h> -#include "e-minicard-view.h" #include <gal/widgets/e-canvas.h> #include "addressbook/backend/ebook/e-book.h" +#include "e-minicard-view.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 7afe9e6ca3..31cf0e72b3 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -21,11 +21,12 @@ */ #include <config.h> -#include <gnome.h> + #include <gal/widgets/e-canvas.h> #include "e-minicard-view.h" #include "e-minicard.h" #include "e-contact-editor.h" + static void e_minicard_view_init (EMinicardView *reflow); static void e_minicard_view_class_init (EMinicardViewClass *klass); static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index fc52a4d864..a82dea3f6a 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -21,7 +21,6 @@ #ifndef __E_MINICARD_VIEW_H__ #define __E_MINICARD_VIEW_H__ -#include <gnome.h> #include <gal/widgets/e-reflow-sorted.h> #include <gal/widgets/e-selection-model-simple.h> #include "addressbook/backend/ebook/e-book.h" diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c index f6489f2a6a..9e37a5f815 100644 --- a/addressbook/gui/widgets/e-minicard-widget-test.c +++ b/addressbook/gui/widgets/e-minicard-widget-test.c @@ -49,7 +49,6 @@ #include "config.h" -#include <gnome.h> #include "e-minicard-widget.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c index 3712d5e306..5ce6c088b2 100644 --- a/addressbook/gui/widgets/e-minicard-widget.c +++ b/addressbook/gui/widgets/e-minicard-widget.c @@ -21,7 +21,6 @@ */ #include <config.h> -#include <gnome.h> #include "e-minicard-widget.h" #include "e-minicard.h" diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h index 3eb544c15e..950afba7d8 100644 --- a/addressbook/gui/widgets/e-minicard-widget.h +++ b/addressbook/gui/widgets/e-minicard-widget.h @@ -21,9 +21,8 @@ #ifndef __E_MINICARD_WIDGET_H__ #define __E_MINICARD_WIDGET_H__ -#include <gnome.h> -#include "addressbook/backend/ebook/e-card.h" #include <gal/widgets/e-canvas.h> +#include "addressbook/backend/ebook/e-card.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 871d8aa446..787f131a44 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -21,20 +21,19 @@ */ #include <config.h> -#include <gnome.h> -#include "e-minicard.h" -#include "e-minicard-label.h" -#include "addressbook/backend/ebook/e-book.h" #include <gal/e-text/e-text.h> #include <gal/util/e-util.h> #include <gal/widgets/e-canvas-utils.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-popup-menu.h> +#include "addressbook/backend/ebook/e-book.h" #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" +#include "e-minicard.h" +#include "e-minicard-label.h" +#include "e-minicard-view.h" #include "e-contact-editor.h" #include "e-contact-save-as.h" -#include "e-minicard-view.h" static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 34dbac0cc0..3ebbe22505 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -21,7 +21,7 @@ #ifndef __E_MINICARD_H__ #define __E_MINICARD_H__ -#include <gnome.h> +#include <libgnomeui/gnome-canvas.h> #include "addressbook/contact-editor/e-contact-editor.h" #include "addressbook/backend/ebook/e-card.h" #include "addressbook/backend/ebook/e-card-simple.h" diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 1d10b71f78..10e13d9bdf 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -8,10 +8,11 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> -#include "gal-view-factory-minicard.h" -#include "gal-view-minicard.h" +#include <glib.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> +#include "gal-view-factory-minicard.h" +#include "gal-view-minicard.h" #define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)->klass) diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c index 0566a85760..470a84389e 100644 --- a/addressbook/gui/widgets/test-minicard-label.c +++ b/addressbook/gui/widgets/test-minicard-label.c @@ -19,9 +19,8 @@ #include "config.h" -#include <gnome.h> -#include "e-minicard-label.h" #include <gal/widgets/e-canvas.h> +#include "e-minicard-label.h" /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *label; diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c index c03d11d07e..54cedd1a58 100644 --- a/addressbook/gui/widgets/test-minicard-view.c +++ b/addressbook/gui/widgets/test-minicard-view.c @@ -17,9 +17,7 @@ #include "config.h" -#include <gnome.h> #include <libgnorba/gnorba.h> -#include <bonobo.h> #include <e-util/e-canvas.h> #include "e-minicard-view.h" diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c index e16ca675b3..b368ba1b87 100644 --- a/addressbook/gui/widgets/test-minicard.c +++ b/addressbook/gui/widgets/test-minicard.c @@ -19,7 +19,11 @@ #include "config.h" -#include <gnome.h> +#include <gtk/gtkmain.h> +#include <libgnomeui/gnome-app.h> +#include <libgnomeui/gnome-init.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> + #include "e-minicard.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 1a2cc9f017..0e54c57164 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -47,12 +47,12 @@ #include "config.h" -#include <gnome.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-reflow.h> -#include "e-minicard.h" #include <gal/widgets/e-scroll-frame.h> +#include "e-minicard.h" + /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *reflow; GnomeCanvasItem *rect; diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c index d6fbfdc5db..af6c92d638 100644 --- a/addressbook/printing/e-contact-print-envelope.c +++ b/addressbook/printing/e-contact-print-envelope.c @@ -20,15 +20,13 @@ * Boston, MA 02111-1307, USA. */ - -#include "e-contact-print-envelope.h" #include <libgnomeprint/gnome-print.h> #include <libgnomeprint/gnome-print-dialog.h> #include <libgnomeprint/gnome-print-master.h> #include <libgnomeprint/gnome-print-master-preview.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" +#include "addressbook/printing/e-contact-print-envelope.h" #define ENVELOPE_HEIGHT (72.0 * 4.0) #define ENVELOPE_WIDTH (72.0 * 9.5) diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h index 45aa051401..f3f3219af1 100644 --- a/addressbook/printing/e-contact-print-envelope.h +++ b/addressbook/printing/e-contact-print-envelope.h @@ -23,7 +23,6 @@ #ifndef E_CONTACT_PRINT_ENVELOPE_H #define E_CONTACT_PRINT_ENVELOPE_H -#include <gnome.h> #include <addressbook/backend/ebook/e-card.h> #include "e-contact-print-types.h" diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c index 5eb5cadacf..3188458925 100644 --- a/addressbook/printing/e-contact-print-style-editor.c +++ b/addressbook/printing/e-contact-print-style-editor.c @@ -20,8 +20,8 @@ * Boston, MA 02111-1307, USA. */ -#include <gnome.h> #include "e-contact-print-style-editor.h" + static void e_contact_print_style_editor_init (EContactPrintStyleEditor *card); static void e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass); static void e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h index cf0f17f889..d9211c2c51 100644 --- a/addressbook/printing/e-contact-print-style-editor.h +++ b/addressbook/printing/e-contact-print-style-editor.h @@ -22,7 +22,7 @@ #ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__ #define __E_CONTACT_PRINT_STYLE_EDITOR_H__ -#include <gnome.h> +#include <gtk/gtkvbox.h> #include <glade/glade.h> #ifdef __cplusplus diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h index e99cfe6d39..e778c58220 100644 --- a/addressbook/printing/e-contact-print-types.h +++ b/addressbook/printing/e-contact-print-types.h @@ -23,7 +23,7 @@ #ifndef E_CONTACT_PRINT_TYPES_H #define E_CONTACT_PRINT_TYPES_H -#include <gnome.h> +#include <glib.h> #include <libgnomeprint/gnome-font.h> typedef struct _EContactPrintStyle EContactPrintStyle; diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 337f0f2007..32333fcab1 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -21,20 +21,24 @@ */ -#include "e-contact-print.h" +#include <ctype.h> +#include <stdlib.h> +#include <glib.h> +#include <gnome-xml/tree.h> +#include <gnome-xml/parser.h> +#include <gnome-xml/xmlmemory.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <libgnomeprint/gnome-print.h> #include <libgnomeprint/gnome-print-dialog.h> #include <libgnomeprint/gnome-print-master.h> #include <libgnomeprint/gnome-print-master-preview.h> #include <libgnomeprint/gnome-print-multipage.h> -#include <gnome-xml/tree.h> -#include <gnome-xml/parser.h> -#include <gnome-xml/xmlmemory.h> -#include <ctype.h> #include <gal/widgets/e-unicode.h> #include <addressbook/backend/ebook/e-book.h> #include <addressbook/backend/ebook/e-card.h> #include <addressbook/backend/ebook/e-card-simple.h> +#include "e-contact-print.h" #define SCALE 5 #define HYPHEN_PIXELS 20 diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index fb17271f6b..bc4c312bb0 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -23,7 +23,6 @@ #ifndef E_CONTACT_PRINT_H #define E_CONTACT_PRINT_H -#include <gnome.h> #include <addressbook/backend/ebook/e-book.h> #include "e-contact-print-types.h" diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c index d4dccc0b87..3f40ca751d 100644 --- a/addressbook/printing/test-contact-print-style-editor.c +++ b/addressbook/printing/test-contact-print-style-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 "e-contact-print-style-editor.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 1b73fda3da..4c6ab595c9 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -22,7 +22,12 @@ #include "config.h" -#include <gnome.h> +#include <stdlib.h> +#include <gtk/gtkmain.h> +#include <libgnome/gnome-defs.h> +#include <libgnomeui/gnome-app.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-init.h> #include <glade/glade.h> #include "e-contact-print.h" |