diff options
Diffstat (limited to 'addressbook')
39 files changed, 30 insertions, 113 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 7da481846b..df54840cd6 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -41,6 +41,7 @@ #include <gpilotd/gnome-pilot-conduit-sync-abs.h> #include <libgpilotdCM/gnome-pilot-conduit-management.h> #include <libgpilotdCM/gnome-pilot-conduit-config.h> +#include <libgnome/gnome-config.h> #include <e-dialog-widgets.h> #include <e-pilot-map.h> #include <e-pilot-settings.h> diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 8d02ac0d46..952a657447 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -44,8 +44,8 @@ #include "shell/e-component-view.h" #include <string.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-i18n.h> -#include <gtk/gtkimage.h> #include <gconf/gconf-client.h> #include <e-util/e-util.h> #include <libedataserver/e-url.h> diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index ba5877c51d..76b5dca5c1 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -15,20 +15,6 @@ #include <stdlib.h> #include <sys/time.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkrange.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtklabel.h> #include <gtk/gtk.h> #include <glib/gi18n.h> diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index d58b7400aa..678c23e448 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -26,11 +26,7 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-href.h> diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 22c274eea3..5d075a48e3 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -24,7 +24,7 @@ #include <string.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libebook/e-book.h> #include <libedataserver/e-url.h> diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index 567139025b..67b07b684e 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -33,11 +33,8 @@ #include <libedataserver/e-source-list.h> #include <libedataserverui/e-source-selector.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtksignal.h> typedef struct { diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 45a634d87b..3650a50392 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -25,14 +25,9 @@ #include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> -#include <glib.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <misc/e-gui-utils.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkstock.h> -#include <gtk/gtklabel.h> #include <string.h> #include <stdlib.h> #include <locale.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h index 755016d680..c946317b68 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.h +++ b/addressbook/gui/contact-editor/e-contact-editor-address.h @@ -20,7 +20,7 @@ #ifndef __E_CONTACT_EDITOR_ADDRESS_H__ #define __E_CONTACT_EDITOR_ADDRESS_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include <libebook/e-contact.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index bca5f14499..8d3122876b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -25,10 +25,6 @@ #include <e-util/e-util-private.h> #include <libgnome/gnome-util.h> #include <glib/gi18n.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.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 d0c9690d59..aec9ac45a5 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -20,7 +20,7 @@ #ifndef __E_CONTACT_EDITOR_FULLNAME_H__ #define __E_CONTACT_EDITOR_FULLNAME_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include <libebook/e-contact.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index 9e8aa8d071..887e8037cf 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -23,15 +23,6 @@ #include "e-contact-editor-im.h" #include <libgnome/gnome-util.h> #include <glib/gi18n.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtksizegroup.h> -#include <gtk/gtkstock.h> #include <string.h> #include <e-util/e-icon-factory.h> #include <e-util/e-util-private.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.h b/addressbook/gui/contact-editor/e-contact-editor-im.h index 9db0d03c80..813032b19b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.h +++ b/addressbook/gui/contact-editor/e-contact-editor-im.h @@ -20,7 +20,7 @@ #ifndef __E_CONTACT_EDITOR_IM_H__ #define __E_CONTACT_EDITOR_IM_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include <libebook/e-contact.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 01561f3a89..89bfd61ea6 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -26,15 +26,8 @@ #include <string.h> #include <time.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtktextview.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> #include <libgnomeui/gnome-window-icon.h> #include <libgnome/gnome-util.h> #include <glib/gi18n.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index e63c868158..c35758baa3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -30,8 +30,7 @@ #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 704b3ca8d2..9e6839671f 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -27,12 +27,7 @@ #include <config.h> #include <ctype.h> #include <string.h> -#include <glib.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktable.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-app.h> #include <libebook/e-book.h> diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index 2c067ae683..e5b6bc6dec 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -22,8 +22,7 @@ #include <config.h> #endif -#include <gtk/gtkstock.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "eab-editor.h" diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index 6cba7b8d9d..5cc521865f 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -28,8 +28,7 @@ #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 3cfeb67fbf..b579bd159e 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -14,12 +14,7 @@ #include "eab-contact-merging.h" #include "eab-contact-compare.h" #include <glade/glade.h> -#include <gtk/gtktable.h> #include <gtk/gtk.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkcontainer.h> #include <string.h> #include "addressbook/gui/widgets/eab-contact-display.h" #include "e-util/e-util-private.h" diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index ae553ad4e6..aa5c53ae1b 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -9,13 +9,13 @@ #include <config.h> #include <string.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "eab-marshal.h" #include "e-addressbook-model.h" #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <gnome.h> #include <misc/e-gui-utils.h> #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 95e3b214a9..c2eec4a6fa 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include <config.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "e-addressbook-model.h" #include "e-addressbook-table-adapter.h" @@ -9,7 +10,6 @@ #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <gnome.h> struct _EAddressbookTableAdapterPrivate { EABModel *model; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index eb4c2a6a4a..cf11d0a271 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -22,11 +22,8 @@ #include <config.h> -#include <gtk/gtk.h> - #include <glib/gi18n.h> #include <libgnome/gnome-util.h> -#include <gtk/gtkscrolledwindow.h> #include <table/e-table-scrolled.h> #include <table/e-table-model.h> #include <misc/e-gui-utils.h> diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 3ba45d6302..3e418b8087 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -20,7 +20,7 @@ #ifndef __EAB_VIEW_H__ #define __EAB_VIEW_H__ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-ui-component.h> #include <widgets/menus/gal-view-instance.h> #include <libebook/e-book.h> diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 772798432f..c2db50ff28 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -27,8 +27,7 @@ #include "eab-marshal.h" #include "util/eab-book-util.h" -#include <gtk/gtkselection.h> -#include <gtk/gtkdnd.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <misc/e-canvas.h> #include <glib/gi18n.h> diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index e35b9fb52f..b77d73cd68 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -21,9 +21,6 @@ #include <config.h> #include <string.h> -#include <glib.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtkmain.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index a1d084869c..4ec8e26a16 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -20,7 +20,7 @@ #ifndef __E_MINICARD_H__ #define __E_MINICARD_H__ -#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtk.h> #include "addressbook/gui/contact-editor/eab-editor.h" #include <libgnomecanvas/gnome-canvas.h> #include <libebook/e-contact.h> diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 14aee2a027..1e18d51e8f 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -26,6 +26,7 @@ #include <errno.h> #include <string.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-selector.h> @@ -38,7 +39,6 @@ #include "misc/e-image-chooser.h" #include <e-util/e-icon-factory.h> #include "eab-contact-merging.h" -#include <gnome.h> #include <composer/e-msg-composer.h> #include <mail/em-composer-utils.h> diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 9dc8f67818..fd676e8bb2 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -20,7 +20,7 @@ #ifndef __E_ADDRESSBOOK_UTIL_H__ #define __E_ADDRESSBOOK_UTIL_H__ -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libebook/e-book.h> #include "addressbook/gui/contact-editor/e-contact-editor.h" #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h" diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index a30a4456a6..533fac4374 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -33,18 +33,6 @@ #include <string.h> #include "addressbook.h" #include "eab-popup-control.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkvbox.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-property-bag.h> #include <bonobo/bonobo-generic-factory.h> diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h index 79e134e812..1223338872 100644 --- a/addressbook/gui/widgets/eab-popup-control.h +++ b/addressbook/gui/widgets/eab-popup-control.h @@ -32,7 +32,7 @@ #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <gtk/gtkeventbox.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index b1313858eb..1a9b1d4c51 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -10,7 +10,7 @@ #ifndef _GAL_VIEW_FACTORY_MINICARD_H_ #define _GAL_VIEW_FACTORY_MINICARD_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <widgets/menus/gal-view-factory.h> #define GAL_TYPE_VIEW_FACTORY_MINICARD (gal_view_factory_minicard_get_type ()) diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index e77d9067a8..cd6eac3f4d 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -24,11 +24,10 @@ #include <ctype.h> #include <string.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtk/gtkvbox.h> - #include <libebook/e-book.h> #include <libedataserverui/e-source-selector.h> diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 2361c41310..41b2ac342a 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -22,11 +22,10 @@ #include <ctype.h> #include <string.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtk/gtkvbox.h> - #include <libebook/e-book.h> #include <libedataserverui/e-source-selector.h> diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index ef54ffd844..5b674d97fa 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -29,7 +29,7 @@ #include <stdio.h> #include <string.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h index 69998dde10..c814d45a37 100644 --- a/addressbook/printing/e-contact-print-style-editor.h +++ b/addressbook/printing/e-contact-print-style-editor.h @@ -21,7 +21,7 @@ #ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__ #define __E_CONTACT_PRINT_STYLE_EDITOR_H__ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <glade/glade.h> #ifdef __cplusplus diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index d2ca1a6e64..3582ac6ba5 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -26,8 +26,6 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> - #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> @@ -36,7 +34,6 @@ #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <gtk/gtk.h> #include <libedataserver/e-flag.h> #include <libedataserver/e-xml-utils.h> diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index fbafb136aa..3f4eb427e4 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -22,8 +22,7 @@ #ifndef E_CONTACT_PRINT_H #define E_CONTACT_PRINT_H -#include <glib.h> -#include <gtk/gtkprintoperation.h> +#include <gtk/gtk.h> #include <libebook/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 b10d1433d0..26eddcfae0 100644 --- a/addressbook/printing/test-contact-print-style-editor.c +++ b/addressbook/printing/test-contact-print-style-editor.c @@ -22,7 +22,7 @@ #include "config.h" #include <stdlib.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-ui-init.h> #include <bonobo/bonobo-main.h> diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c index 7fc367d24d..c97a846eec 100644 --- a/addressbook/printing/test-print.c +++ b/addressbook/printing/test-print.c @@ -22,7 +22,7 @@ #include "config.h" #include <stdlib.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-ui-init.h> #include <glade/glade.h> diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index ec05a1da63..717413b7c8 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -28,7 +28,7 @@ #include <glib/gi18n.h> #include <bonobo-activation/bonobo-activation.h> #include <bonobo/bonobo-main.h> -#include <gnome.h> +#include <libgnome/gnome-init.h> #include <libebook/e-book.h> |