diff options
372 files changed, 327 insertions, 1337 deletions
@@ -1,3 +1,8 @@ +2008-06-06 Matthew Barnes <mbarnes@redhat.com> + + ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and + GTK_DISABLE_SINGLE_INCLUDES defined. (#536637) + 2008-06-06 Tor Lillqvist <tml@novell.com> * configure.in: Add -Wl,--exclude-libs=libiconv.a to ICONV_LIBS on diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h index 2fe13ca2c2..c6fda684d9 100644 --- a/a11y/addressbook/ea-addressbook-view.h +++ b/a11y/addressbook/ea-addressbook-view.h @@ -22,7 +22,7 @@ #ifndef __EA_ADDRESSBOOK_VIEW_H__ #define __EA_ADDRESSBOOK_VIEW_H__ -#include <gtk/gtkaccessible.h> +#include <gtk/gtk.h> #include "e-addressbook-view.h" #ifdef __cplusplus diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index 52f923eb24..7319e49b90 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -21,8 +21,7 @@ #include <config.h> #include <string.h> -#include <gtk/gtkaccessible.h> -#include <glib/gstrfuncs.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "ea-minicard.h" #include "ea-minicard-view.h" diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c index 9ce7a11fc8..a995e3bc6e 100644 --- a/a11y/calendar/ea-cal-view.c +++ b/a11y/calendar/ea-cal-view.c @@ -29,7 +29,7 @@ #include "e-week-view.h" #include "calendar-commands.h" #include "goto.h" -#include <glib/gstrfuncs.h> +#include <glib.h> #include <glib/gi18n.h> static void ea_cal_view_class_init (EaCalViewClass *klass); diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h index 0d89dfdf65..b966b6db19 100644 --- a/a11y/calendar/ea-cal-view.h +++ b/a11y/calendar/ea-cal-view.h @@ -26,7 +26,7 @@ #ifndef __EA_CAL_VIEW_H__ #define __EA_CAL_VIEW_H__ -#include <gtk/gtkaccessible.h> +#include <gtk/gtk.h> #include "e-calendar-view.h" #ifdef __cplusplus diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c index 66537c0f3f..4f16cf6bc0 100644 --- a/a11y/calendar/ea-day-view.c +++ b/a11y/calendar/ea-day-view.c @@ -29,7 +29,7 @@ #include "ea-calendar-helpers.h" #include "ea-gnome-calendar.h" #include "calendar-commands.h" -#include <glib/gstrfuncs.h> +#include <glib.h> #include <glib/gi18n.h> static void ea_day_view_class_init (EaDayViewClass *klass); diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index 6de483f952..02602f23f5 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -26,7 +26,7 @@ #include "ea-gnome-calendar.h" #include "calendar-commands.h" #include <string.h> -#include <gtk/gtknotebook.h> +#include <gtk/gtk.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-data-server-util.h> #include <glib/gi18n.h> diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h index c70e95ab46..6a3cf201dd 100644 --- a/a11y/calendar/ea-gnome-calendar.h +++ b/a11y/calendar/ea-gnome-calendar.h @@ -26,7 +26,7 @@ #ifndef __EA_GNOME_CALENDAR_H__ #define __EA_GNOME_CALENDAR_H__ -#include <gtk/gtkaccessible.h> +#include <gtk/gtk.h> #include "gnome-cal.h" #ifdef __cplusplus diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h index 780cff4509..0e539d9628 100644 --- a/a11y/e-table/gal-a11y-e-table.h +++ b/a11y/e-table/gal-a11y-e-table.h @@ -9,10 +9,9 @@ #ifndef __GAL_A11Y_E_TABLE_H__ #define __GAL_A11Y_E_TABLE_H__ -#include <glib-object.h> +#include <gtk/gtk.h> #include <atk/atkobject.h> #include <atk/atkcomponent.h> -#include <gtk/gtkaccessible.h> #define GAL_A11Y_TYPE_E_TABLE (gal_a11y_e_table_get_type ()) #define GAL_A11Y_E_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE, GalA11yETable)) diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h index a9468ced54..952a4ea2b9 100644 --- a/a11y/e-table/gal-a11y-e-tree.h +++ b/a11y/e-table/gal-a11y-e-tree.h @@ -7,10 +7,9 @@ #ifndef __GAL_A11Y_E_TREE_H__ #define __GAL_A11Y_E_TREE_H__ -#include <glib-object.h> +#include <gtk/gtk.h> #include <atk/atkobject.h> #include <atk/atkcomponent.h> -#include <gtk/gtkaccessible.h> #define GAL_A11Y_TYPE_E_TREE (gal_a11y_e_tree_get_type ()) #define GAL_A11Y_E_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree)) diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index 00cba1b477..761bbdf251 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -27,7 +27,7 @@ #include <time.h> #include <string.h> #include <libgnomecanvas/gnome-canvas.h> -#include <glib/gdate.h> +#include <glib.h> #include <e-util/e-util.h> #include <glib/gi18n.h> #include <libedataserver/e-data-server-util.h> diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c index 8a90700f41..affe328561 100644 --- a/a11y/widgets/ea-combo-button.c +++ b/a11y/widgets/ea-combo-button.c @@ -6,8 +6,7 @@ #include <config.h> #include "ea-combo-button.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> static AtkObjectClass *parent_class; diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h index 8f4c279cba..7e1aec498e 100644 --- a/a11y/widgets/ea-combo-button.h +++ b/a11y/widgets/ea-combo-button.h @@ -7,7 +7,7 @@ #ifndef __EA_COMBO_BUTTON_H_ #define __EA_COMBO_BUTTON_H_ -#include <gtk/gtkaccessible.h> +#include <gtk/gtk.h> #include <misc/e-combo-button.h> #define EA_TYPE_COMBO_BUTTON (ea_combo_button_get_type ()) diff --git a/a11y/widgets/ea-expander.c b/a11y/widgets/ea-expander.c index db174c37cb..c0046e9e9a 100644 --- a/a11y/widgets/ea-expander.c +++ b/a11y/widgets/ea-expander.c @@ -22,7 +22,6 @@ #include <config.h> #include "ea-expander.h" -#include <gtk/gtkbutton.h> #include <glib/gi18n.h> static AtkObjectClass *parent_class; diff --git a/a11y/widgets/ea-expander.h b/a11y/widgets/ea-expander.h index 5216161658..e91602594b 100644 --- a/a11y/widgets/ea-expander.h +++ b/a11y/widgets/ea-expander.h @@ -23,7 +23,7 @@ #ifndef _EA_EXPANDER_H_ #define _EA_EXPANDER_H_ -#include <gtk/gtkaccessible.h> +#include <gtk/gtk.h> #include <misc/e-expander.h> #define EA_TYPE_EXPANDER (ea_expander_get_type ()) 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> diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 369fed6104..843d15465c 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -25,6 +25,8 @@ #define G_LOG_DOMAIN "ecalconduit" +#include <glib/gi18n.h> +#include <libgnome/gnome-config.h> #include <libecal/e-cal-types.h> #include <libecal/e-cal.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index 534c9ef8fb..7585c36833 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -67,6 +67,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ categories */ if(strlen(category->name[i]) == 0){ int cat_to_add_len; + int desktopUniqueID; cat_to_add_len = strlen(cat_to_add); retval = i; @@ -89,7 +90,6 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ } //find a desktop id that is not in use between 128 and 255 - int desktopUniqueID; for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) { int found = 0; for(j=0; j<PILOT_MAX_CATEGORIES; j++){ diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 33178be061..b21370bf13 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -28,6 +28,8 @@ #define G_LOG_DOMAIN "ememoconduit" +#include <glib/gi18n.h> +#include <libgnome/gnome-config.h> #include <libecal/e-cal-types.h> #include <libecal/e-cal.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index a565bdf009..7d6f6ce363 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -28,6 +28,8 @@ #define G_LOG_DOMAIN "etodoconduit" +#include <glib/gi18n.h> +#include <libgnome/gnome-config.h> #include <libecal/e-cal-types.h> #include <libecal/e-cal.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 74583a8f7b..cbf26c7655 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -22,17 +22,6 @@ #include <config.h> #include <stdio.h> #include <string.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #if 0 # include <libgnomeui/gnome-winhints.h> diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h index 43bfb2c523..82dcada516 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.h +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h @@ -22,12 +22,8 @@ #define ALARM_NOTIFY_DIALOG_H #include <time.h> -#include <glib.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkliststore.h> diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index b10b6f55bf..cd3a2e3bb2 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -28,23 +28,7 @@ #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-main.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkeventbox.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkstatusicon.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkversion.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnome/gnome-exec.h> #include <libgnome/gnome-sound.h> diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index b68f28c568..bbff9c21b5 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -25,8 +25,7 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnome/gnome-init.h> #include <libgnome/gnome-sound.h> diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 6fa9aa501c..06f9f910c8 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -24,11 +24,7 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libedataserver/e-categories.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 7f787668e7..76719c7b87 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -35,14 +35,7 @@ #include <ctype.h> #include <errno.h> -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <gtk/gtkfilesel.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkmessagedialog.h> -#include <libgnome/gnome-util.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-messagebox.h> #include <libgnomeui/gnome-stock-icons.h> diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index 99bc173e7b..a258206149 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-i18n.h> #include <evolution-calendar.h> diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index dfc5165b66..5949b2d318 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -22,9 +22,7 @@ #ifndef COMP_UTIL_H #define COMP_UTIL_H -#include <glib.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtkselection.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> #include <libecal/e-cal.h> diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 7267c29380..a80b022e72 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -29,19 +29,8 @@ #endif #include <string.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkfilechooserbutton.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtktextbuffer.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktogglebutton.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-widget.h> diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 4b2be10d48..7e38370f5b 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -29,13 +29,7 @@ #endif #include <string.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkoptionmenu.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> #include <libedataserver/e-time-utils.h> diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index c8f5e89057..a737080c36 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -30,15 +30,7 @@ #include <config.h> #endif -#include <gtk/gtkbox.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkversion.h> - -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-uidefs.h> #include <glib/gi18n.h> diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index ffc3757fb2..d3a1640e9c 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -25,10 +25,7 @@ #include <string.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <libedataserver/e-source.h> #include <libedataserver/e-source-list.h> diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 93dfc1d4b1..0ae16bbbac 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -22,8 +22,7 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <e-util/e-icon-factory.h> diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index ff6870c514..e6af3c7b74 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -22,8 +22,6 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtkmessagedialog.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <e-util/e-icon-factory.h> diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h index 2953bd06ec..936d031e94 100644 --- a/calendar/gui/dialogs/changed-comp.h +++ b/calendar/gui/dialogs/changed-comp.h @@ -21,8 +21,7 @@ #ifndef CHANGED_COMP_H #define CHANGED_COMP_H -#include <glib.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> gboolean changed_component_dialog (GtkWindow *window, ECalComponent *comp, gboolean deleted, gboolean changed); diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index 609c872db7..5d664fb4a1 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -23,8 +23,6 @@ #endif #include <glib/gi18n.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtksignal.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> #include "comp-editor-page.h" diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index 5a121ab92b..61f7aea413 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -22,7 +22,7 @@ #define COMP_EDITOR_PAGE_H #include <time.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> #include <libecal/e-cal.h> diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index dabf01745e..347dddeef0 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -25,8 +25,6 @@ #include <ctype.h> #include <string.h> #include <libical/ical.h> -#include <glib.h> -#include <gtk/gtklabel.h> #include <glib/gi18n.h> #include <bonobo-activation/bonobo-activation.h> #include <bonobo/bonobo-control.h> diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index b83dd33e01..f7786dbd37 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -21,7 +21,7 @@ #ifndef _COMP_EDITOR_UTIL_H_ #define _COMP_EDITOR_UTIL_H_ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "comp-editor-page.h" void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 0662572690..f40e093354 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -27,14 +27,12 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <glib.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkstock.h> #include <bonobo/bonobo-ui-util.h> #include <bonobo/bonobo-widget.h> #include <libgnome/libgnome.h> -#include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index e4f5c55623..12996cd48a 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -22,7 +22,6 @@ #include <config.h> #endif -#include <gtk/gtkmessagedialog.h> #include <bonobo/bonobo-i18n.h> #include "copy-source-dialog.h" #include "select-source-dialog.h" diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h index 89e1955673..d6390c2c5d 100644 --- a/calendar/gui/dialogs/copy-source-dialog.h +++ b/calendar/gui/dialogs/copy-source-dialog.h @@ -21,7 +21,7 @@ #ifndef COPY_SOURCE_DIALOG_H #define COPY_SOURCE_DIALOG_H -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libedataserver/e-source.h> #include <libecal/e-cal.h> #include <libecal/e-cal-util.h> diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 8446608222..e9e088b1a8 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -22,10 +22,6 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtkstock.h> -#include <gtk/gtk.h> -#include <gtk/gtkmessagedialog.h> #include <glib/gi18n.h> #include <e-util/e-icon-factory.h> #include "e-util/e-error.h" diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index 9dd79c6881..5c24e0105c 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -21,7 +21,7 @@ #ifndef DELETE_COMP_H #define DELETE_COMP_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> gboolean delete_component_dialog (ECalComponent *comp, diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index ea9406da73..520a2a6aee 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -22,8 +22,7 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <e-util/e-icon-factory.h> diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 8f2fbb4ed7..b10e13328a 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -23,11 +23,7 @@ #include <config.h> #endif -#include <gtk/gtksignal.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gnome.h> +#include <gtk/gtk.h> #include <libical/ical.h> #include <glade/glade.h> #include <misc/e-map.h> diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index 67787190af..0a9fb7ddb8 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -21,7 +21,7 @@ #ifndef __E_DELEGATE_DIALOG_H__ #define __E_DELEGATE_DIALOG_H__ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index eacb87d780..da34afd2d7 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -24,7 +24,7 @@ #ifndef __EVENT_EDITOR_H__ #define __EVENT_EDITOR_H__ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include "comp-editor.h" diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 10dbd5cbec..9e76f412cb 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -26,13 +26,10 @@ #endif #include <string.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkmessagedialog.h> -#include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> +#include <gdk/gdkkeysyms.h> #include <libedataserverui/e-source-combo-box.h> #include "common/authentication.h" #include "e-util/e-categories-config.h" diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h index d913628158..0cdbbdc105 100644 --- a/calendar/gui/dialogs/memo-editor.h +++ b/calendar/gui/dialogs/memo-editor.h @@ -25,7 +25,7 @@ #ifndef __MEMO_EDITOR_H__ #define __MEMO_EDITOR_H__ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include "comp-editor.h" #define TYPE_MEMO_EDITOR (memo_editor_get_type ()) diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index cbb4d2b0cd..f36bb7f479 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -27,12 +27,7 @@ #endif #include <string.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> #include <libedataserverui/e-source-combo-box.h> diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index ecf1436abc..bffe9460fa 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -22,8 +22,6 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include "recur-comp.h" diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h index dcb9464418..27d872b55b 100644 --- a/calendar/gui/dialogs/recur-comp.h +++ b/calendar/gui/dialogs/recur-comp.h @@ -21,7 +21,7 @@ #ifndef RECUR_COMP_H #define RECUR_COMP_H -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #include <libecal/e-cal-component.h> #include <libecal/e-cal-util.h> diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index cfa6b2b49d..a58240d946 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -28,17 +28,7 @@ #include <config.h> #endif -#include <gtk/gtklabel.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> #include <libedataserver/e-time-utils.h> diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h index c598b21b6a..a6f4d0a3a5 100644 --- a/calendar/gui/dialogs/save-comp.h +++ b/calendar/gui/dialogs/save-comp.h @@ -22,7 +22,7 @@ #ifndef SAVE_COMP_H #define SAVE_COMP_H -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> GtkResponseType save_component_dialog (GtkWindow *parent, ECalComponent *comp); diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 36afc0ba7a..cbbab9bb17 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -25,11 +25,7 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnomeui/gnome-dialog-util.h> #include <glade/glade.h> diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index 7fef786e0f..06e8bfc0d7 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -23,7 +23,6 @@ #endif #include <bonobo/bonobo-i18n.h> -#include <gtk/gtkstock.h> #include <e-util/e-icon-factory.h> #include <libedataserverui/e-source-selector-dialog.h> #include "select-source-dialog.h" diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h index 70b4e9d19b..9618074013 100644 --- a/calendar/gui/dialogs/select-source-dialog.h +++ b/calendar/gui/dialogs/select-source-dialog.h @@ -21,7 +21,7 @@ #ifndef SELECT_SOURCE_DIALOG_H #define SELECT_SOURCE_DIALOG_H -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libedataserver/e-source.h> #include <libecal/e-cal.h> diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 0db1be872a..006a480764 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -22,7 +22,6 @@ #include <config.h> #endif -#include <gtk/gtkmessagedialog.h> #include "e-util/e-error.h" #include "send-comp.h" diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h index 6f407747e9..e40d0fcd14 100644 --- a/calendar/gui/dialogs/send-comp.h +++ b/calendar/gui/dialogs/send-comp.h @@ -21,8 +21,7 @@ #ifndef SEND_COMP_H #define SEND_COMP_H -#include <glib.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #include <libecal/e-cal-component.h> diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index b9d5ace108..c6d07929ee 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -25,8 +25,7 @@ #include <config.h> #endif -#include <gtk/gtksignal.h> -#include <gtk/gtktogglebutton.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> #include <misc/e-dateedit.h> diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index 2980c7c2ae..31a98ff037 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -24,7 +24,7 @@ #ifndef __TASK_EDITOR_H__ #define __TASK_EDITOR_H__ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include "comp-editor.h" diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 6b004294f9..ffa3b74ccd 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -26,15 +26,10 @@ #endif #include <string.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> +#include <gdk/gdkkeysyms.h> #include <libedataserverui/e-source-combo-box.h> #include <misc/e-dateedit.h> #include <e-util/e-dialog-utils.h> diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 05d532346d..1b0dd5fcd2 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -22,11 +22,7 @@ #include <config.h> #include <string.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktreednd.h> #include <glib/gi18n.h> -#include <glib.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-time-utils.h> #include "calendar-config.h" diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h index 3f618f51c9..e00f989763 100644 --- a/calendar/gui/e-alarm-list.h +++ b/calendar/gui/e-alarm-list.h @@ -23,7 +23,7 @@ #ifndef E_ALARM_LIST_H #define E_ALARM_LIST_H -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c index 90eeae71a7..9460b809a5 100644 --- a/calendar/gui/e-cal-component-memo-preview.c +++ b/calendar/gui/e-cal-component-memo-preview.c @@ -28,9 +28,9 @@ #endif #include <string.h> -#include <gnome.h> #include <gtk/gtk.h> #include <glib/gi18n.h> +#include <libgnome/gnome-url.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-categories.h> #include <gtkhtml/gtkhtml.h> diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h index 1d22eb640d..d136be7e98 100644 --- a/calendar/gui/e-cal-component-memo-preview.h +++ b/calendar/gui/e-cal-component-memo-preview.h @@ -25,7 +25,7 @@ #ifndef _E_CAL_COMPONENT_MEMO_PREVIEW_H_ #define _E_CAL_COMPONENT_MEMO_PREVIEW_H_ -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #define E_TYPE_CAL_COMPONENT_MEMO_PREVIEW (e_cal_component_memo_preview_get_type ()) diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index ad44c735ee..560a39e68a 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -27,10 +27,9 @@ #endif #include <string.h> -#include <gnome.h> -#include <gio/gio.h> #include <gtk/gtk.h> #include <glib/gi18n.h> +#include <libgnome/gnome-url.h> #include <libedataserver/e-categories.h> #include <libecal/e-cal-time-util.h> #include <gtkhtml/gtkhtml.h> diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index a7593ac75f..f031a91826 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -24,7 +24,7 @@ #ifndef _E_CAL_COMPONENT_PREVIEW_H_ #define _E_CAL_COMPONENT_PREVIEW_H_ -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-stream.h> diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c index 13ad4eb6ac..658eb12f4b 100644 --- a/calendar/gui/e-cal-config.c +++ b/calendar/gui/e-cal-config.c @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "e-cal-config.h" static GObjectClass *ecp_parent_class; diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 89ea2cd56a..884f2a199f 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -35,13 +35,10 @@ #include <math.h> #include <time.h> #include <sys/stat.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkvscrollbar.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> +#include <gdk/gdkkeysyms.h> #include <misc/e-gui-utils.h> #include <table/e-table-memory-store.h> #include <table/e-cell-checkbox.h> @@ -50,7 +47,6 @@ #include <table/e-cell-combo.h> #include <misc/e-popup-menu.h> #include <misc/e-cell-date-edit.h> -#include <glib/gi18n.h> #include <libgnome/gnome-exec.h> #include <libgnome/gnome-util.h> #include <e-util/e-categories-config.h> diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 0bb90b74f8..1c3a35a059 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -24,8 +24,7 @@ #define _E_CAL_LIST_VIEW_H_ #include <time.h> -#include <gtk/gtktable.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include "e-calendar-view.h" #include "gnome-cal.h" diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 7619c4fb0c..75b946d05b 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -24,7 +24,7 @@ #include <math.h> #include <string.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libedataserver/e-data-server-util.h> #include "calendar-config.h" diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 87c826a226..dff18fdcfb 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -23,7 +23,7 @@ #endif #include <string.h> -#include <glib/garray.h> +#include <glib.h> #include <glib/gi18n.h> #include <libedataserver/e-time-utils.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index 44be681c25..9da6d9dee0 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -24,7 +24,7 @@ #ifndef _E_CALENDAR_TABLE_H_ #define _E_CALENDAR_TABLE_H_ -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <table/e-table-scrolled.h> #include <misc/e-cell-date-edit.h> #include "e-activity-handler.h" diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 0feebfaa4e..8275dfa8c0 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -27,17 +27,10 @@ #include <string.h> #include <time.h> -#include <glib.h> +#include <gtk/gtk.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkstock.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkbindings.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcontainer.h> -#include <gtk/gtkwindow.h> -#include <glib/gi18n.h> #include <libedataserver/e-time-utils.h> #include <e-util/e-error.h> #include <e-util/e-dialog-utils.h> diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 4aaeebac2a..5080830733 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -24,8 +24,7 @@ #define _E_CALENDAR_VIEW_H_ #include <libecal/e-cal.h> -#include <gtk/gtktable.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include "e-cal-model.h" #include "gnome-cal.h" diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index 18b9a6bdaf..70e780d162 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -21,10 +21,6 @@ */ #include <string.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktreednd.h> -#include <glib.h> #include <libedataserver/e-time-utils.h> #include "e-date-time-list.h" #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h index c893c111a9..33adfeec1c 100644 --- a/calendar/gui/e-date-time-list.h +++ b/calendar/gui/e-date-time-list.h @@ -23,7 +23,7 @@ #ifndef E_DATE_TIME_LIST_H #define E_DATE_TIME_LIST_H -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #include <libecal/e-cal-component.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 6be8e34aaf..c72d1d6d6b 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -32,10 +32,7 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkcheckmenuitem.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <misc/e-gui-utils.h> #include "e-day-view-time-item.h" diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index e33591acb7..d5949a323a 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -35,11 +35,6 @@ #include <math.h> #include <time.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkvscrollbar.h> -#include <gtk/gtkwindow.h> #include <text/e-text.h> #include <misc/e-canvas-utils.h> #include <misc/e-popup-menu.h> diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index b9fee2f250..aa6169a1a6 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -25,8 +25,7 @@ #define _E_DAY_VIEW_H_ #include <time.h> -#include <gtk/gtktable.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include "e-calendar-view.h" diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 73f98940e9..d674c308b3 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -29,10 +29,8 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <glib.h> -#include <glib/gstdio.h> -#include <gtk/gtkmisc.h> #include <glib/gi18n.h> +#include <glib/gstdio.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnomeui/gnome-uidefs.h> diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 3b18036841..6a282bd2db 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -26,8 +26,7 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-widget.h> #include <bonobo/bonobo-exception.h> diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index f93d6e9c46..38b43d0ed1 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -23,7 +23,7 @@ #ifndef _E_MEETING_LIST_VIEW_H_ #define _E_MEETING_LIST_VIEW_H_ -#include <gtk/gtktreeview.h> +#include <gtk/gtk.h> #include "e-meeting-store.h" #include <libedataserverui/e-name-selector.h> diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index cc9498c5b0..0955fd2912 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -25,10 +25,8 @@ #include <config.h> #endif -#include <glib.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> -#include <gio/gio.h> #include <libecal/e-cal-component.h> #include <libecal/e-cal-util.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h index 7f111f4676..bde0719588 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -23,7 +23,7 @@ #ifndef _E_MEETING_STORE_H_ #define _E_MEETING_STORE_H_ -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #include "e-meeting-attendee.h" diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 213882fadd..59cfdd28ca 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -33,23 +33,7 @@ #include <stdio.h> #include <string.h> #include <time.h> -#include <glib.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkdrawingarea.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkfixed.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkhscrollbar.h> -#include <gtk/gtkhseparator.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkvscrollbar.h> #include <libgnomeui/gnome-dateedit.h> #include <glib/gi18n.h> #include <libgnomecanvas/gnome-canvas-widget.h> diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 8adae67cb1..170af9493b 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -23,10 +23,7 @@ #ifndef _E_MEETING_TIME_SELECTOR_H_ #define _E_MEETING_TIME_SELECTOR_H_ -#include <glib.h> -#include <gtk/gtkaccelgroup.h> -#include <gtk/gtktable.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <text/e-text.h> #include <table/e-table-model.h> diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 8e9d3361fa..d484f69dae 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -34,10 +34,10 @@ #include <sys/stat.h> #include <unistd.h> -#include <glib.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gnome.h> +#include <gdk/gdkkeysyms.h> +#include <libgnome/gnome-url.h> #include <widgets/misc/e-gui-utils.h> #include <table/e-cell-checkbox.h> #include <table/e-cell-toggle.h> diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 0c7e294366..c3b629298c 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -25,7 +25,7 @@ #ifndef _E_MEMO_TABLE_H_ #define _E_MEMO_TABLE_H_ -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <table/e-table-scrolled.h> #include <widgets/misc/e-cell-date-edit.h> #include "e-activity-handler.h" diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index e8953e3c4d..c06fcea7ac 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -28,7 +28,6 @@ #endif #include <string.h> -#include <gnome.h> #include <glib/gi18n.h> #include <libedataserver/e-time-utils.h> #include <table/e-table-scrolled.h> diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index d91773f4e2..3ab298c533 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -27,7 +27,7 @@ #define _E_MEMOS_H_ #include <bonobo/bonobo-ui-component.h> -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libedataserver/e-source.h> #include <libecal/e-cal.h> #include "e-memo-table.h" diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index c258c7f43c..05c8733486 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -21,8 +21,8 @@ */ #include <config.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkcelleditable.h> #include <libebook/e-destination.h> #include <libedataserverui/e-name-selector-entry.h> diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index 789d185c8d..e73976aac7 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -21,7 +21,6 @@ */ #include <config.h> -#include <gtk/gtkcellrenderertext.h> #include "e-calendar-marshal.h" diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h index 8087977ace..19520c7d51 100644 --- a/calendar/gui/e-select-names-renderer.h +++ b/calendar/gui/e-select-names-renderer.h @@ -23,7 +23,7 @@ #ifndef __E_SELECT_NAMES_RENDERER_H__ #define __E_SELECT_NAMES_RENDERER_H__ -#include <gtk/gtkcellrenderertext.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index b63d015eec..030a58fe83 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -26,7 +26,6 @@ #include <config.h> #endif -#include <gnome.h> #include <glib/gi18n.h> #include <libedataserver/e-time-utils.h> #include <table/e-table-scrolled.h> diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 69464b05b8..fccde9f9f9 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -26,7 +26,7 @@ #define _E_TASKS_H_ #include <bonobo/bonobo-ui-component.h> -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libedataserver/e-source.h> #include <libecal/e-cal.h> #include "e-calendar-table.h" diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 53e5ed482b..7382fd34f5 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -30,10 +30,6 @@ */ #include <config.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkentry.h> -#include <gtk/gtksignal.h> -#include <gnome.h> #include <widgets/e-timezone-dialog/e-timezone-dialog.h> #include <glib/gi18n.h> #include "e-timezone-entry.h" diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h index bc35dbacc9..c9a38a5fda 100644 --- a/calendar/gui/e-timezone-entry.h +++ b/calendar/gui/e-timezone-entry.h @@ -32,7 +32,7 @@ #ifndef __E_TIMEZONE_ENTRY_H_ #define __E_TIMEZONE_ENTRY_H_ -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index f8d53434e8..b1290069f7 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -36,15 +36,9 @@ #include <math.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkselection.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkvscrollbar.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkmain.h> #include <glib/gi18n.h> #include <libgnome/gnome-exec.h> #include <libgnome/gnome-util.h> -#include <gdk-pixbuf/gdk-pixbuf.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> #include <text/e-text.h> #include <misc/e-canvas-utils.h> diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index 4e2ea89564..89762b1105 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -24,7 +24,7 @@ #ifndef _E_WEEK_VIEW_H_ #define _E_WEEK_VIEW_H_ -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include "e-calendar-view.h" diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 561a0dc491..35cc56e17b 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -35,7 +35,6 @@ #include <fcntl.h> #include <glib.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkbindings.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-dialog.h> diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index cc3250f912..f4ed9b2836 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -26,7 +26,7 @@ #define GNOME_CALENDAR_APP_H #include <time.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-ui-component.h> #include <misc/e-calendar.h> #include <libecal/e-cal.h> diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index 91715e3526..adc602e103 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -9,13 +9,7 @@ */ #include <config.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-dialog.h> #include <glade/glade.h> #include "e-util/e-util-private.h" diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index d386f2ad58..d777dc55a5 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -22,9 +22,7 @@ #include <config.h> #include <string.h> -#include <glib.h> -#include <gtk/gtkobject.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-property-bag.h> diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index cb29c5329b..3b6fed85e4 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -26,8 +26,7 @@ #include <glib/gi18n.h> #include <libedataserver/e-time-utils.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libical/ical.h> #include <e-util/e-dialog-utils.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 0335f6304a..f159326fc2 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -26,10 +26,7 @@ #include <config.h> #endif -#include <gtk/gtksignal.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-dialog.h> diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 3f5e029bcf..fc4c7b6c77 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -29,15 +29,10 @@ #include <fcntl.h> #include <errno.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> #include <bonobo/bonobo-i18n.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkmain.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkprogressbar.h> #include <libecal/e-cal.h> #include <libebackend/e-dbhash.h> diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 7ef1f016c1..86404c03ce 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -25,10 +25,7 @@ #include <config.h> #endif -#include <gtk/gtksignal.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-dialog.h> diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 0b08fc893a..66d0017261 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -31,13 +31,7 @@ #include <sys/types.h> #include <fcntl.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkscrolledwindow.h> +#include <gtk/gtk.h> #include <libecal/e-cal.h> #include <libedataserverui/e-source-selector.h> diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 9907f557e3..0b75f9b634 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -9,9 +9,8 @@ */ #include <string.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gdk-pixbuf/gdk-pixbuf.h> #include <libedataserver/e-categories.h> #include <libedataserverui/e-categories-dialog.h> #include "e-categories-config.h" diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h index ed6b5639ae..0188be90e1 100644 --- a/e-util/e-categories-config.h +++ b/e-util/e-categories-config.h @@ -11,9 +11,7 @@ #ifndef __E_CATEGORIES_CONFIG_H__ #define __E_CATEGORIES_CONFIG_H__ -#include <glib.h> -#include <gdk/gdk.h> -#include <gtk/gtkentry.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/e-util/e-config.c b/e-util/e-config.c index 5918600000..22f6ac5f0b 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -27,15 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtknotebook.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtktable.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkalignment.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-druid.h> #include <libgnomeui/gnome-druid-page-standard.h> diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 8207e18181..ce43e1c8cf 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -29,22 +29,12 @@ #include "e-dialog-utils.h" #include <unistd.h> -#include <glib.h> #include <glib/gstdio.h> -#include <gdkconfig.h> #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> #endif -#include <gtk/gtkmain.h> -#include <gtk/gtkplug.h> -#include <gtk/gtkversion.h> - -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkstock.h> - #include <gconf/gconf-client.h> #include <glib/gi18n.h> #include <libgnome/gnome-util.h> diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index e3971b8a7c..34a8380d81 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -23,8 +23,7 @@ #ifndef E_DIALOG_UTILS_H #define E_DIALOG_UTILS_H -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkfilechooser.h> +#include <gtk/gtk.h> void e_notice (gpointer parent, GtkMessageType type, diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index 20f7db5ce5..6bf3434046 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -25,13 +25,7 @@ #include <math.h> #include <string.h> #include <time.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkspinbutton.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-dateedit.h> #include "e-dialog-widgets.h" diff --git a/e-util/e-error.c b/e-util/e-error.c index 1fee2f4164..4ee905fcee 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -27,16 +27,7 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <glib.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <libgnome/gnome-url.h> diff --git a/e-util/e-event.c b/e-util/e-event.c index 5ac51d10ee..b3d2cb547d 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -27,16 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include "e-event.h" diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index 4da3e6dcfe..7e20577d4c 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -20,14 +20,6 @@ #include "e-gui-utils.h" #include <e-util/e-icon-factory.h> -#include <glib.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkicontheme.h> - #include <libgnome/gnome-program.h> #include <libgnomeui/gnome-icon-lookup.h> diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h index 678ab1bcd8..740c77e95e 100644 --- a/e-util/e-gui-utils.h +++ b/e-util/e-gui-utils.h @@ -1,7 +1,7 @@ #ifndef E_GUI_UTILS_H #define E_GUI_UTILS_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> GdkPixbuf *e_icon_for_mime_type (const char *mime_type, int size); GtkWidget *e_create_image_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2); diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 556c52ebb5..98d788a673 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -30,8 +30,6 @@ #include <pthread.h> -#include <gtk/gtkicontheme.h> -#include <gtk/gtkimage.h> #ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H #include <libgnomeui/gnome-thumbnail.h> #endif diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index 92ecac8ac6..d8271292a7 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -23,8 +23,7 @@ #ifndef _E_ICON_FACTORY_H_ #define _E_ICON_FACTORY_H_ -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> enum { E_ICON_SIZE_MENU, diff --git a/e-util/e-import.c b/e-util/e-import.c index 92a54f59ac..d52c225112 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -27,15 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtknotebook.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtktable.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkalignment.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-druid.h> #include <libgnomeui/gnome-druid-page-standard.h> diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 85dbcd24f1..f315c25836 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -2,10 +2,8 @@ #ifndef _E_PLUGIN_H #define _E_PLUGIN_H -#include <glib.h> -#include <glib-object.h> +#include <gtk/gtk.h> #include <libxml/tree.h> -#include <gtk/gtkwidget.h> /* ********************************************************************** */ diff --git a/e-util/e-popup.c b/e-util/e-popup.c index b7d904a6eb..60f280aabe 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -27,17 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include "e-popup.h" diff --git a/e-util/e-request.c b/e-util/e-request.c index beb52686e9..e7199254e0 100644 --- a/e-util/e-request.c +++ b/e-util/e-request.c @@ -26,12 +26,6 @@ #include "e-request.h" -#include <gtk/gtkbox.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkstock.h> - /** * e_request_string: diff --git a/e-util/e-request.h b/e-util/e-request.h index 8a446a15d5..f3471fd2b6 100644 --- a/e-util/e-request.h +++ b/e-util/e-request.h @@ -23,7 +23,7 @@ #ifndef E_REQUEST_H #define E_REQUEST_H -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> char *e_request_string (GtkWindow *parent, const char *title, diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h index ba68cae113..6593b9a978 100644 --- a/e-util/e-text-event-processor-types.h +++ b/e-util/e-text-event-processor-types.h @@ -24,12 +24,10 @@ #ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__ #define __E_TEXT_EVENT_PROCESSOR_TYPES_H__ -#include <glib/gmacros.h> +#include <gtk/gtk.h> G_BEGIN_DECLS -#include <gdk/gdkevents.h> - typedef union _ETextEventProcessorEvent ETextEventProcessorEvent; typedef enum { diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index f3b408fb3d..62c2e8f866 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -24,8 +24,7 @@ #ifndef __E_TEXT_EVENT_PROCESSOR_H__ #define __E_TEXT_EVENT_PROCESSOR_H__ -#include <glib.h> -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include <e-util/e-text-event-processor-types.h> #ifdef __cplusplus diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 5c859be975..9bbc507c6f 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <stdio.h> @@ -27,14 +27,6 @@ #include <gconf/gconf-client.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcolorbutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> - #include <camel/camel-utf8.h> #include "e-util-labels.h" diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 97a49f4db3..0330abdc15 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -22,8 +22,7 @@ #ifndef _E_UTIL_LABELS_H #define _E_UTIL_LABELS_H -#include <glib.h> -#include <gdk/gdkcolor.h> +#include <gtk/gtk.h> struct _GtkWindow; struct _GConfClient; diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 49754cfe96..5135eb1d30 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -21,8 +21,8 @@ #include <config.h> +#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <gtk/gtkmessagedialog.h> #include <string.h> #include "gconf-bridge.h" diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h index aa7bfaefb8..ba67f4f8e6 100644 --- a/e-util/gconf-bridge.h +++ b/e-util/gconf-bridge.h @@ -23,8 +23,7 @@ #define __GCONF_BRIDGE_H__ #include <gconf/gconf-client.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/filter/filter-colour.c b/filter/filter-colour.c index 1d3a670b1f..d697bf75b8 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -25,8 +25,7 @@ #include <config.h> #endif -#include <gtk/gtksignal.h> -#include <gtk/gtkcolorbutton.h> +#include <gtk/gtk.h> #include "libedataserver/e-sexp.h" #include "filter-colour.h" diff --git a/filter/filter-element.h b/filter/filter-element.h index 4ed4377aec..3ba15804a4 100644 --- a/filter/filter-element.h +++ b/filter/filter-element.h @@ -23,9 +23,7 @@ #ifndef _FILTER_ELEMENT_H #define _FILTER_ELEMENT_H -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> diff --git a/filter/filter-file.c b/filter/filter-file.c index 0418a36a2d..b95a65fd69 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -25,13 +25,9 @@ #include <string.h> #include <sys/types.h> -#include <glib.h> -#include <glib/gstdio.h> - #include <gtk/gtk.h> - #include <glib/gi18n.h> -#include <gtk/gtkfilechooserbutton.h> +#include <glib/gstdio.h> #include <libedataserver/e-sexp.h> diff --git a/filter/filter-int.c b/filter/filter-int.c index ace5040747..39811bccb9 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -26,7 +26,7 @@ #endif #include <stdlib.h> -#include <gtk/gtkspinbutton.h> +#include <gtk/gtk.h> #include <libedataserver/e-sexp.h> #include "filter-int.h" diff --git a/filter/filter-part.c b/filter/filter-part.c index 7bf7e3c506..bbbb1c9d70 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -28,8 +28,7 @@ #include <stdlib.h> #include <string.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "filter-part.h" diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 863faacc75..4a5a8cf592 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -39,7 +39,7 @@ #include <config.h> #endif -#include <glib.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> #include <string.h> @@ -49,22 +49,6 @@ #include <glade/glade.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktextbuffer.h> -#include <gtk/gtktextview.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtktable.h> - -#include <glib/gi18n.h> #include <libgnomeui/gnome-druid.h> #include <libgnomeui/gnome-druid-page-standard.h> diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 83756701da..c20da7f1bf 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -25,13 +25,13 @@ #ifndef EM_ACCOUNT_EDITOR_H #define EM_ACCOUNT_EDITOR_H +#include <gtk/gtk.h> + #ifdef __cplusplus extern "C" { #pragma } #endif /* __cplusplus */ -#include <gtk/gtkvbox.h> - struct _EAccount; typedef struct _EMAccountEditor EMAccountEditor; diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index 2558e733bd..0d9549c89c 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -26,13 +26,6 @@ #include <camel/camel-url.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> - #include <glib/gi18n.h> #include "mail-component.h" diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index c74d96b470..60d7b6e962 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -24,16 +24,8 @@ #ifndef __EM_ACCOUNT_PREFS_H__ #define __EM_ACCOUNT_PREFS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - -#include <gtk/gtkvbox.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkclist.h> +#include <gtk/gtk.h> #include <glade/glade.h> -#include <gtk/gtktreeview.h> #include <table/e-table.h> @@ -41,6 +33,11 @@ extern "C" { #include <shell/Evolution.h> +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + #define EM_ACCOUNT_PREFS_TYPE (em_account_prefs_get_type ()) #define EM_ACCOUNT_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefs)) diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 9413a2be46..1494bbda84 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -25,7 +25,7 @@ #endif #include <string.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <libedataserver/e-data-server-util.h> #include <e-util/e-util.h> diff --git a/mail/em-config.c b/mail/em-config.c index e7fdf6964f..840d64114e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -27,16 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include <libgnome/gnome-url.h> diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 5444fd0e32..49821b2bab 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -31,12 +31,7 @@ #include <string.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkvpaned.h> -#include <gtk/gtkhpaned.h> -#include <gtkhtml/gtkhtml.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gconf/gconf-client.h> @@ -100,6 +95,8 @@ #include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */ +#include <gtkhtml/gtkhtml.h> + extern CamelSession *session; CamelStore *vfolder_store; /* the 1 static vfolder store */ diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 18267c41c6..e6123fb7b3 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -25,19 +25,7 @@ #include <string.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmisc.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <gconf/gconf-client.h> diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index a88095082d..fa96101306 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -26,10 +26,6 @@ #include <string.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkhbox.h> - #include <e-util/e-util.h> #include <glib/gi18n.h> diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index 5077f86f2a..bae3b10ff2 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -24,7 +24,7 @@ #ifndef __EM_FOLDER_SELECTION_BUTTON_H__ #define __EM_FOLDER_SELECTION_BUTTON_H__ -#include <gtk/gtkbutton.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c index fb8ce56f1d..655a16aa6f 100644 --- a/mail/em-folder-selection.c +++ b/mail/em-folder-selection.c @@ -26,8 +26,7 @@ #include <string.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include "em-folder-tree.h" #include "em-folder-selector.h" diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 3ed037325f..1fac3210df 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -32,14 +32,6 @@ #include <e-util/e-util.h> #include <misc/e-gui-utils.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkstock.h> - #include <camel/camel-url.h> #include <camel/camel-store.h> #include <camel/camel-session.h> diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 7685a02c08..fa783bb892 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -23,7 +23,7 @@ #ifndef EM_FOLDER_SELECTOR_H #define EM_FOLDER_SELECTOR_H -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #ifdef cplusplus extern "C" { diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index d4af60f883..fb35b2f13d 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -24,8 +24,7 @@ #ifndef __EM_FOLDER_TREE_MODEL_H__ #define __EM_FOLDER_TREE_MODEL_H__ -#include <gtk/gtktreednd.h> -#include <gtk/gtktreestore.h> +#include <gtk/gtk.h> #include <libxml/tree.h> diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 4e94103d44..332c3e8cce 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -36,8 +36,6 @@ #include <libxml/tree.h> #include <glib/gi18n.h> -#include <gtk/gtk.h> -#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 3fe3aa5f81..97ae8e8ce0 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -24,7 +24,7 @@ #ifndef __EM_FOLDER_TREE_H__ #define __EM_FOLDER_TREE_H__ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <camel/camel-store.h> #include "mail/em-folder-tree-model.h" diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 99f089dba4..c2493d98be 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -27,12 +27,9 @@ #include <sys/stat.h> #include <unistd.h> -#include <glib.h> #include <glib/gstdio.h> -#include <libgnome/gnome-util.h> - -#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include <libgnome/gnome-util.h> #ifdef G_OS_WIN32 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */ diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index e081eb586d..92a55344a7 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -23,8 +23,7 @@ #ifndef EM_FOLDER_VIEW_H #define EM_FOLDER_VIEW_H -#include <gtk/gtkvbox.h> -#include <gtk/gtkprintoperation.h> +#include <gtk/gtk.h> #include "mail/em-popup.h" /* Standard GObject macros */ diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index bd8bcc6c2d..3a04fcd4a8 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -26,7 +26,7 @@ #include <string.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> @@ -42,28 +42,6 @@ #include <gtkhtml/gtkhtml-embedded.h> #include <gtkhtml/gtkhtml-search.h> -#include <gtk/gtkeventbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktable.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtktoolbutton.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtksignal.h> - #include <glade/glade.h> #include <glib/gi18n.h> diff --git a/mail/em-format-html.c b/mail/em-format-html.c index dc656d56f1..c43ca1aa46 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1491,6 +1491,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab { const char *fmt, *html; char *mhtml = NULL; + gboolean is_rtl; if (value == NULL) return; @@ -1503,7 +1504,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab else html = value; - gboolean is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; + is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; if (emfh->simple_headers) { fmt = "<b>%s</b>: %s<br>"; } else { diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index 7b54dbe887..9c74504ea4 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -28,7 +28,7 @@ #include <stdio.h> #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-stream.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include "em-html-stream.h" #define d(x) diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 4f7a369d7e..7f7a1b240d 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -30,7 +30,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include "em-icon-stream.h" #include "e-util/e-icon-factory.h" diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index df680c9fc1..4ffe2874fd 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -35,25 +35,10 @@ #include "misc/e-charset-picker.h" #include <bonobo/bonobo-generic-factory.h> -#include <gtk/gtkcolorbutton.h> -#include <gtk/gtkfilechooserbutton.h> -#include <gtk/gtkfontbutton.h> - #include <glade/glade.h> #include <gconf/gconf-client.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenuitem.h> - #include "libedataserverui/e-cell-renderer-color.h" #include "e-util/e-util-private.h" diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index e5c9a041df..6688f6f600 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -28,7 +28,7 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <shell/Evolution.h> struct _ESignature; diff --git a/mail/em-menu.c b/mail/em-menu.c index 77a93aba18..567f5876f3 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -27,16 +27,7 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> - -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include <libgnome/gnome-url.h> diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 0ef8105e4f..638de4b698 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -33,7 +33,6 @@ #undef interface #endif -#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gconf/gconf-client.h> diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h index 09e34e2cb6..47d2fa38b9 100644 --- a/mail/em-message-browser.h +++ b/mail/em-message-browser.h @@ -2,7 +2,7 @@ #ifndef EM_MESSAGE_BROWSER_H #define EM_MESSAGE_BROWSER_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "em-folder-view.h" /* Standard GObject macros */ diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 29c79e618b..d6496eafdc 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -38,13 +38,6 @@ #include <gconf/gconf-client.h> #include <glade/glade.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtklabel.h> - -#include <gtk/gtkfilechooserbutton.h> #include <glib/gstdio.h> #include "e-util/e-error.h" diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 45627cdce0..10266c3f1c 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -29,8 +29,7 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <glib.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #define EM_NETWORK_PREFS_TYPE (em_network_prefs_get_type ()) #define EM_NETWORK_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_NETWORK_PREFS_TYPE, EMNetworkPrefs)) diff --git a/mail/em-popup.c b/mail/em-popup.c index 00c9bcbd1e..531e7421c7 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -27,20 +27,9 @@ #include <string.h> #include <stdlib.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gio/gio.h> - -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> - #include <libgnome/gnome-url.h> #include "em-popup.h" diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 014c43c3f4..8dea1a0a76 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -47,19 +47,6 @@ #include <glade/glade.h> #include <glib/gi18n.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreestore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkprogressbar.h> -#include <gtk/gtkmenuitem.h> - #define d(x) typedef struct _EMSubscribeEditor EMSubscribeEditor; diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h index ca02f14bee..c6989af84b 100644 --- a/mail/em-subscribe-editor.h +++ b/mail/em-subscribe-editor.h @@ -2,7 +2,7 @@ #ifndef _EM_SUBSCRIBE_EDITOR_H #define _EM_SUBSCRIBE_EDITOR_H -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> GtkDialog *em_subscribe_editor_new(void); diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index b65ffe420f..6a308df7fa 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -33,10 +33,8 @@ #include <dirent.h> #include <string.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkcheckbutton.h> #include <gconf/gconf-client.h> diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 1ad64b91e3..7066473a48 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -35,10 +35,7 @@ #include <ctype.h> #include <string.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtklabel.h> - +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index afc7f7fb1c..3a9caabb7c 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -35,10 +35,8 @@ #include <dirent.h> #include <string.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkcheckbutton.h> #include <gconf/gconf-client.h> diff --git a/mail/mail-component.c b/mail/mail-component.c index 850efe70e7..cf06fd0f56 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -74,7 +74,7 @@ #include "e-task-bar.h" -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #include <e-util/e-mktemp.h> #include <Evolution.h> diff --git a/mail/mail-config.c b/mail/mail-config.c index ec89953c05..ec2e491519 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -35,14 +35,13 @@ #include <string.h> #include <ctype.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> #ifndef G_OS_WIN32 #include <sys/wait.h> #endif -#include <gtk/gtkdialog.h> #include <gtkhtml/gtkhtml.h> #include <glade/glade.h> @@ -256,9 +255,11 @@ gconf_jh_check_changed (GConfClient *client, guint cnxn_id, if (!config->jh_check) { mail_session_set_junk_headers (NULL, NULL, 0); } else { - config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - GSList *node = config->jh_header; + GSList *node; GPtrArray *name, *value; + + config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); + node = config->jh_header; name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { @@ -278,9 +279,11 @@ static void gconf_jh_headers_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { - config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - GSList *node = config->jh_header; + GSList *node; GPtrArray *name, *value; + + config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); + node = config->jh_header; name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 19486dce3f..5563f30dec 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -27,19 +27,7 @@ #include <stdio.h> #include <string.h> -/* for the dialog stuff */ -#include <glib.h> #include <glib/gi18n.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkprogressbar.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktable.h> #include "libedataserver/e-account-list.h" diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 77ba3dc65c..3a12da4daf 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -23,13 +23,14 @@ #ifndef MAIL_SEND_RECV_H #define MAIL_SEND_RECV_H +#include <gtk/gtk.h> +#include "mail-config.h" + #ifdef __cplusplus extern "C" { #pragma } #endif /* __cplusplus */ -#include "mail-config.h" - /* send/receive all uri's */ GtkWidget *mail_send_receive(void); /* receive a single uri */ diff --git a/mail/message-list.c b/mail/message-list.c index 9e5d099202..12bf98f459 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -31,15 +31,11 @@ #include <string.h> #include <ctype.h> -#include <glib.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> #include <gconf/gconf-client.h> -#include <gtk/gtk.h> - -#include <glib/gi18n.h> - #include <camel/camel-exception.h> #include <camel/camel-file-utils.h> #include <camel/camel-folder.h> diff --git a/mail/message-list.h b/mail/message-list.h index db45b36787..61f3264d41 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -24,8 +24,7 @@ #ifndef _MESSAGE_LIST_H_ #define _MESSAGE_LIST_H_ -#include <gtk/gtkobject.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <table/e-table-simple.h> #include <table/e-tree-scrolled.h> diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index d398b7b8d2..e28591faf2 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -25,8 +25,6 @@ #include <config.h> #endif -#include <gtk/gtkstock.h> - #include "message-tag-editor.h" static void message_tag_editor_class_init (MessageTagEditorClass *class); diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 8ae3b1926b..408c6df9da 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -24,8 +24,7 @@ #ifndef __MESSAGE_TAG_EDITOR_H__ #define __MESSAGE_TAG_EDITOR_H__ -#include <gtk/gtkwidget.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <camel/camel-folder.h> #include <camel/camel-folder-summary.h> diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index f321df2bf7..d65008b6de 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -26,16 +26,7 @@ #include <stdlib.h> #include <string.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtklist.h> - -#include <gtk/gtkentry.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkbox.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkcellrenderertext.h> - +#include <gtk/gtk.h> #include <glade/glade.h> #include <gconf/gconf.h> diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 6394eb986a..cf653148d2 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -10,6 +10,8 @@ #include "config.h" #endif +#include <gtk/gtk.h> +#include <glib/gstdio.h> #include "e-util/e-icon-factory.h" #include "e-util/e-mktemp.h" #include "camel/camel-medium.h" @@ -18,11 +20,6 @@ #include "camel/camel-stream-fs.h" #include "mail/em-format-hook.h" #include "mail/em-format-html.h" -#include "glib/gstdio.h" -#include "gtk/gtkbutton.h" -#include "gtk/gtkbox.h" -#include "gtk/gtkimage.h" -#include "gtk/gtkhbbox.h" #include "gtkhtml/gtkhtml-embedded.h" #include "gst/gst.h" diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c index 38add141c0..8d2e262eae 100644 --- a/plugins/calendar-file/calendar-file.c +++ b/plugins/calendar-file/calendar-file.c @@ -19,14 +19,7 @@ * */ -#include <gtk/gtklabel.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktable.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include <e-util/e-config.h> #include <calendar/gui/e-cal-config.h> #include <libedataserver/e-source.h> diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c index b2caa62e4f..21a100e093 100644 --- a/plugins/calendar-http/calendar-http.c +++ b/plugins/calendar-http/calendar-http.c @@ -19,16 +19,7 @@ * */ -#include <glib-object.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktable.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkcheckbutton.h> +#include <gtk/gtk.h> #include <e-util/e-config.h> #include <calendar/gui/e-cal-config.h> #include <libedataserver/e-source.h> diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c index d241f6c5ae..e61c0800aa 100644 --- a/plugins/copy-tool/copy-tool.c +++ b/plugins/copy-tool/copy-tool.c @@ -16,7 +16,7 @@ #include "mail/em-popup.h" -#include <gtk/gtkclipboard.h> +#include <gtk/gtk.h> #include "camel/camel-internet-address.h" #include "camel/camel-url.h" diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index cdd4a14a69..5dbf214f48 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -23,10 +23,6 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtktable.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> #include <e-util/e-error.h> @@ -268,10 +264,12 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD header_list = gconf_client_get_list (client,path,GCONF_VALUE_STRING, NULL); for (q = header_list,pos = 0; q != NULL; q = q->next,pos++) { + gchar **parse_header_list; + memset(&temp_header_value_details,0,sizeof(CustomSubHeader)); temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader)); buffer = q->data; - gchar **parse_header_list = g_strsplit_set (buffer, "=;,", -1); + parse_header_list = g_strsplit_set (buffer, "=;,", -1); str_colon = g_strconcat (parse_header_list[0], ":", NULL); temp_header_details.header_type_value = g_string_new(""); if (temp_header_details.header_type_value) { diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index b32d598054..98b67495a6 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -20,7 +20,7 @@ #ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__ #define __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #define EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG (epech_dialog_get_type ()) #define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog)) diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 8df2bbbd2f..db60ffcc3d 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -28,10 +28,9 @@ #include <string.h> #include <unistd.h> #include <sys/stat.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> -#include <gtk/gtk.h> -#include <gtk/gtkdialog.h> #include <gconf/gconf-client.h> #include <camel/camel-provider.h> #include <camel/camel-url.h> diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c index 9ccf0617e3..69ca5351cf 100644 --- a/plugins/exchange-operations/exchange-change-password.c +++ b/plugins/exchange-operations/exchange-change-password.c @@ -29,9 +29,7 @@ #include <e2k-utils.h> #include <glade/glade-xml.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkentry.h> -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #define FILENAME EVOLUTION_GLADEDIR "/exchange-change-password.glade" #define ROOTNODE "pass_dialog" diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index ef82d388ab..a719059a5e 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -43,17 +43,6 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-dialog-widgets.h> #include <glade/glade.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkmenushell.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktogglebutton.h> - -#include <gtk/gtkoptionmenu.h> - -#include <glib.h> #include <string.h> diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index 9a705f0d9d..02ae3dce26 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -6,7 +6,7 @@ #include <exchange-types.h> #include <e2k-security-descriptor.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index 46088b9ba8..4ec12c35a7 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -43,12 +43,6 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-error.h> #include <glade/glade-xml.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> typedef struct { const char *uri; diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h index 3e87e06b38..facccd8e98 100644 --- a/plugins/exchange-operations/exchange-delegates.h +++ b/plugins/exchange-operations/exchange-delegates.h @@ -5,7 +5,7 @@ #define __EXCHANGE_DELEGATES_H__ #include <exchange-types.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index a770044a12..c6e3ff9b99 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -25,7 +25,6 @@ #include <glib/gi18n.h> #include <glade/glade.h> #include <gtk/gtk.h> -#include <gtk/gtkdialog.h> #include <gconf/gconf-client.h> #include <exchange-account.h> #include <e-util/e-dialog-utils.h> diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index 594ce34c0c..1cd6924176 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -28,11 +28,6 @@ #include <glib/gi18n.h> #include <e-util/e-dialog-utils.h> #include <glade/glade-xml.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> #include "exchange-folder-size-display.h" enum { diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h index 2f109277c6..46b5ffe0c5 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.h +++ b/plugins/exchange-operations/exchange-folder-size-display.h @@ -4,8 +4,7 @@ #ifndef __EXCHANGE_FOLDER_SIZE_DISPLAY_H__ #define __EXCHANGE_FOLDER_SIZE_DISPLAY_H__ -#include <gtk/gtkwidget.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index e7a877c103..5ea6e0b619 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -25,7 +25,6 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <gtk/gtkdialog.h> #include <gconf/gconf-client.h> #include <e-folder-exchange.h> #include <exchange-hierarchy.h> diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index 179cc3d62a..9b4ed097e8 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -40,16 +40,6 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-error.h> #include <glade/glade-xml.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkmenushell.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtk.h> struct _ExchangePermissionsDialogPrivate { ExchangeAccount *account; diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h index 11598a5e62..e08d80bb49 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.h +++ b/plugins/exchange-operations/exchange-permissions-dialog.h @@ -4,7 +4,7 @@ #ifndef __EXCHANGE_PERMISSIONS_DIALOG_H__ #define __EXCHANGE_PERMISSIONS_DIALOG_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "e-folder.h" #include "exchange-types.h" diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index a48fd72c77..f433a45438 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -23,14 +23,10 @@ #endif #include <string.h> -#include <glib.h> #include <libedataserverui/e-name-selector.h> #include <libedataserverui/e-contact-store.h> #include "exchange-operations.h" #include <e-util/e-error.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtk.h> #include <libgnome/libgnome.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index f759d0f722..13e10e0f58 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -20,7 +20,6 @@ #ifndef __EXCHANGE_SENDOPTIONS_DIALOG_H__ #define __EXCHANGE_SENDOPTIONS_DIALOG_H__ -#include <gtk/gtkwidget.h> #include <gtk/gtk.h> diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index bd5da39a70..48c9170736 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -28,11 +28,6 @@ #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-widget.h> #include <e-util/e-dialog-utils.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkvbox.h> #include <libedataserverui/e-name-selector.h> #include "e2k-xml-utils.h" diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h index cd8059b00f..2c68e90378 100644 --- a/plugins/exchange-operations/exchange-user-dialog.h +++ b/plugins/exchange-operations/exchange-user-dialog.h @@ -4,7 +4,7 @@ #ifndef __E2K_USER_DIALOG_H__ #define __E2K_USER_DIALOG_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #define E2K_TYPE_USER_DIALOG (e2k_user_dialog_get_type ()) #define E2K_USER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E2K_TYPE_USER_DIALOG, E2kUserDialog)) diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index aaa06d3c73..698b39ffb9 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -201,8 +201,6 @@ show_composer_dialog (EMsgComposer *composer) void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) { - d(printf ("\n\nexternal_editor plugin is launched \n\n")); - /* The template to be used in the external editor */ /* README: I have not marked this for translation. @@ -212,6 +210,11 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) gint fd; char *filename = NULL; + char *editor = NULL; + GConfClient *gconf; + GArray *array; + + d(printf ("\n\nexternal_editor plugin is launched \n\n")); fd = g_file_open_tmp (NULL, &filename, NULL); if (fd > 0) { @@ -225,9 +228,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) return ; } - char *editor = NULL; - GConfClient *gconf; - gconf = gconf_client_get_default (); editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL); if (!editor) { @@ -240,7 +240,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select) } g_object_unref (gconf); - GArray *array; array = g_array_sized_new (TRUE, TRUE, sizeof (gpointer), 2 * sizeof(gpointer)); array = g_array_append_val (array, editor); array = g_array_append_val (array, filename); diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index fb4019c3ef..f338e2d91d 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -304,6 +304,7 @@ plugin_google (EPlugin *epl, GtkWidget *widget; GtkWidget *luser; GtkWidget *user; + GtkWidget *label; char *uri; char *username; const char *ssl_prop; @@ -372,7 +373,7 @@ plugin_google (EPlugin *epl, gtk_label_set_mnemonic_widget (GTK_LABEL (luser), user); - GtkWidget *label = gtk_label_new_with_mnemonic (_("Re_fresh:")); + label = gtk_label_new_with_mnemonic (_("Re_fresh:")); gtk_widget_show (label); gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (parent), diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index 002eeaa0d4..9e76401a61 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -18,14 +18,7 @@ * */ -#include <gtk/gtklabel.h> -#include <gtk/gtkentry.h> -#include <gtk/gtktable.h> -#include <gtk/gtkspinbutton.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include <e-util/e-config.h> #include <addressbook/gui/widgets/eab-config.h> #include <libedataserver/e-source.h> diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 87ce3774d5..ef81dffe85 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -24,17 +24,7 @@ #endif #include <glade/glade.h> #include "junk-settings.h" -#include <glib/gmain.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkbutton.h> #include <gtk/gtk.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnome/gnome-init.h> #include <glib/gi18n.h> diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index 59204e1f14..f41d8c8fe0 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -28,8 +28,6 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <glib.h> -#include <gtk/gtkvbox.h> #include <gtk/gtk.h> #include <camel/camel-store.h> #include <e-gw-connection.h> diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 6259336728..9a9c7a39da 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -27,21 +27,9 @@ #include <config.h> #endif -#include <glib.h> #include <string.h> #include <glib/gi18n.h> #include <glade/glade.h> -#include <glib/gmain.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtk.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> #include <libedataserverui/e-passwords.h> #include <mail/mail-component.h> diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index 3d329a9edc..2fc63bcd04 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -19,7 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include <gtk/gtkwidget.h> #include <gtk/gtk.h> #define TYPE_PROXY_LOGIN (proxy_login_get_type ()) diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 7ad11da2e3..f36155c354 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -28,18 +28,6 @@ #include <stdlib.h> #include <glib/gi18n.h> #include <glade/glade.h> -#include <glib/gmain.h> - -#include <gtk/gtktreemodel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtk.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> #include <libedataserverui/e-contact-store.h> diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 0f49760a16..9c1d8b0d3c 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -21,7 +21,6 @@ * Boston, MA 02110-1301, USA. */ -#include <gtk/gtkwidget.h> #include <libedataserver/e-account.h> #include <gtk/gtk.h> diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 93ae7c8909..7bca14eba6 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -24,18 +24,7 @@ #endif #include <glade/glade.h> #include "share-folder.h" -#include <glib/gmain.h> #include <glib/gi18n-lib.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtk.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> #include <libedataserverui/e-contact-store.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnome/gnome-init.h> diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 76516ac778..a5c1c2de5a 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -28,8 +28,6 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <glib.h> -#include <gtk/gtkvbox.h> #include <gtk/gtk.h> #include <camel/camel-store.h> #include <e-gw-connection.h> diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index 4f6fbf77d8..b438579e7d 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -29,8 +29,6 @@ #include <mail/em-config.h> #include <mail/mail-config.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtktreemodel.h> #include <gtk/gtk.h> #include <libedataserver/e-account.h> diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index 3c47a6555d..594edfc811 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -23,13 +23,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index dde61923ac..85db1d424c 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -25,8 +25,6 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtk.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> #include <camel/camel-stream.h> diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h index 2e9f119642..22216d1283 100644 --- a/plugins/itip-formatter/itip-view.h +++ b/plugins/itip-formatter/itip-view.h @@ -25,8 +25,7 @@ #include <stdarg.h> #include <unistd.h> -#include <glib-object.h> -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #include <libedataserver/e-source-list.h> #include <libecal/e-cal.h> diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index fc98ee7bc7..60dc3de3e6 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -11,15 +11,8 @@ #include <glib/gi18n-lib.h> #include <stdio.h> #include <string.h> +#include <gtk/gtk.h> #include <gconf/gconf-client.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtktable.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkdialog.h> #include <libgnome/gnome-url.h> #include "camel/camel-multipart.h" diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index d423cf82ed..61db73cd1b 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -10,26 +10,11 @@ #include "config.h" #endif +#include <gtk/gtk.h> #include <glib/gi18n-lib.h> #include <string.h> #include <stdio.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtktreesortable.h> -#include <gtk/gtktreemodelsort.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtknotebook.h> - #include "e-util/e-plugin.h" #include "shell/es-menu.h" diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index 0365c297e8..ba70c4288f 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -7,6 +7,7 @@ #include "config.h" #endif +#include <gtk/gtk.h> #include <glib/gi18n-lib.h> #include <string.h> #include <stdio.h> @@ -17,12 +18,6 @@ #include "mail/em-format.h" #include <gconf/gconf-client.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtktable.h> -#include <gtk/gtklabel.h> #include "mail/em-config.h" void org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t); diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c index c1d8646c2a..8e9fe41e84 100644 --- a/plugins/save-attachments/save-attachments.c +++ b/plugins/save-attachments/save-attachments.c @@ -28,26 +28,10 @@ #include <string.h> #include <stdio.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <gtk/gtkcheckbutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtktreestore.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkframe.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkfilechooserbutton.h> - #include <camel/camel-folder.h> #include <camel/camel-exception.h> #include <camel/camel-mime-message.h> diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 5fae1846fd..595fb151a3 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -22,13 +22,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> + #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <libedataserver/e-source.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-data-server-util.h> diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index b871657280..0c89e647ff 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -23,13 +23,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> + #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 58b81459a0..94d08f392b 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -22,13 +22,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> + #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 0ed4030b8b..61579224b9 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -26,14 +26,8 @@ #include <config.h> #endif -#include <glib.h> -#include <glib/gi18n.h> -#include <gio/gio.h> -#include <gtk/gtkfilechooser.h> -#include <gtk/gtkfilechooserdialog.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkstock.h> #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> diff --git a/shell/e-history.h b/shell/e-history.h index 89bfe674a9..91b7bc3724 100644 --- a/shell/e-history.h +++ b/shell/e-history.h @@ -23,7 +23,7 @@ #ifndef _E_HISTORY_H_ #define _E_HISTORY_H_ -#include <gnome.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 5f12035239..4c75cc0d80 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -25,14 +25,7 @@ #endif #include <string.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkrc.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktogglebutton.h> #include <glib/gi18n.h> -#include <gdk-pixbuf/gdk-pixbuf.h> #include "e-shell-constants.h" #include "e-shell-marshal.h" diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h index 54d2a92b05..cee4842741 100644 --- a/shell/e-shell-folder-title-bar.h +++ b/shell/e-shell-folder-title-bar.h @@ -23,8 +23,7 @@ #ifndef __E_SHELL_FOLDER_TITLE_BAR_H__ #define __E_SHELL_FOLDER_TITLE_BAR_H__ -#include <gtk/gtkhbox.h> -#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 48c480227b..32648baf1a 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -27,8 +27,7 @@ #include <unistd.h> #include <string.h> -#include <glib.h> - +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glade/glade.h> @@ -39,8 +38,6 @@ #include <libgnomeui/gnome-druid-page-edge.h> #include <libgnomeui/gnome-druid-page-standard.h> -#include <gtk/gtkfilechooserbutton.h> - #include "misc/e-gui-utils.h" #include "e-util/e-dialog-utils.h" diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index a6de85d45c..d4a1d157ee 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -37,6 +37,7 @@ #include <bonobo-activation/bonobo-activation.h> +#include <stdlib.h> #include <string.h> struct _EShellSettingsDialogPrivate { diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 532ae0dda6..f7ff820598 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -26,9 +26,7 @@ #include <config.h> #endif -#include <glib.h> - -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include "e-shell-view.h" diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 887ced0c87..8e652c6480 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -38,15 +38,7 @@ #include "es-menu.h" #include "es-event.h" -#include <gtk/gtkbutton.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkhpaned.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkiconfactory.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-object.h> diff --git a/shell/e-shell.c b/shell/e-shell.c index 6223cc0599..86e0cd00dd 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -23,14 +23,12 @@ #include <config.h> #include <string.h> +#include <unistd.h> #include <sys/types.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> - #ifdef GDK_WINDOWING_X11 #include <gdk/gdkprivate.h> #include <gdk/gdkx.h> diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index 9bf9b0ae33..20c5e59047 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -28,12 +28,6 @@ #include "e-shell-marshal.h" -#include <gtk/gtk.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktogglebutton.h> - #include <gconf/gconf-client.h> #include <libgnome/gnome-gconf.h> diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index 15280580a9..4ab74024b3 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -23,7 +23,7 @@ #ifndef _E_SIDEBAR_H_ #define _E_SIDEBAR_H_ -#include <gtk/gtkcontainer.h> +#include <gtk/gtk.h> #define E_TYPE_SIDEBAR (e_sidebar_get_type ()) #define E_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SIDEBAR, ESidebar)) diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c index bd72b57f59..e74220ad95 100644 --- a/shell/e-user-creatable-items-handler.c +++ b/shell/e-user-creatable-items-handler.c @@ -36,16 +36,9 @@ #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-control.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <gtk/gtkaccelgroup.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkimagemenuitem.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkseparatormenuitem.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktooltips.h> - #include <stdlib.h> #include <ctype.h> #include <string.h> diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index 3e38a43456..69e3bef56d 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -30,8 +30,6 @@ #include <e-util/e-util.h> -#include <gtk/gtksignal.h> - #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-event-source.h> diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h index b751ae831c..51c5680cd9 100644 --- a/shell/evolution-config-control.h +++ b/shell/evolution-config-control.h @@ -26,7 +26,7 @@ #include "Evolution.h" #include <bonobo/bonobo-object.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #ifdef cplusplus extern "C" { diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h index d0ddb60263..4bd7d582bd 100644 --- a/shell/evolution-shell-component-utils.h +++ b/shell/evolution-shell-component-utils.h @@ -22,7 +22,7 @@ #define __EVOLUTION_SHELL_COMPONENT_UTILS_H__ #include <bonobo/bonobo-ui-component.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/shell/main.c b/shell/main.c index 705f57d369..3bf48be7ae 100644 --- a/shell/main.c +++ b/shell/main.c @@ -22,7 +22,7 @@ #include <config.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> #ifdef G_OS_WIN32 @@ -50,18 +50,6 @@ #include <gconf/gconf-client.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkframe.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkcheckbutton.h> - #include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-sound.h> diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index cb77263883..e2545e6aef 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -28,8 +28,6 @@ #include "ca-trust-dialog.h" #include "certificate-viewer.h" -#include <gtk/gtk.h> - #include <glib/gi18n.h> #include <glade/glade.h> diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h index 54cba41310..5c29cb5616 100644 --- a/smime/gui/ca-trust-dialog.h +++ b/smime/gui/ca-trust-dialog.h @@ -23,7 +23,7 @@ #ifndef _CA_TRUST_DIALOG_H_ #define _CA_TRUST_DIALOG_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "e-cert.h" GtkWidget* ca_trust_dialog_show (ECert *cert, gboolean importing); diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 9de35ae073..fa14fe5ba7 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -31,10 +31,7 @@ #include "cert-trust-dialog.h" #include "ca-trust-dialog.h" -#include <gtk/gtkwidget.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #include <glib/gi18n.h> #include <glade/glade.h> diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 342f3d8c95..d014978e3e 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -29,8 +29,6 @@ #include "e-asn1-object.h" -#include <gtk/gtk.h> - #include <glib/gi18n.h> #include <glade/glade.h> diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h index cb7b07842a..ea1033a1a8 100644 --- a/smime/gui/certificate-viewer.h +++ b/smime/gui/certificate-viewer.h @@ -23,7 +23,7 @@ #ifndef _CERTIFICATE_VIEWER_H_ #define _CERTIFICATE_VIEWER_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "e-cert.h" GtkWidget* certificate_viewer_show (ECert *cert); diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index d41be35ad6..d7101d6ec8 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -25,12 +25,6 @@ #include <glib/gi18n.h> -#include <gtk/gtktextview.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkstock.h> - #include "nss.h" #include "pk11func.h" #include "certdb.h" diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 2ceb871386..05d74b2236 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -24,7 +24,7 @@ #ifndef E_CERT_SELECTOR_H #define E_CERT_SELECTOR_H -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #ifdef cplusplus extern "C" { diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index a224026335..c8040ce15d 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -60,7 +60,8 @@ #include <config.h> #endif -#include <glib.h> +#include <gtk/gtk.h> +#include <glib/gi18n.h> #include <glib/gstdio.h> /* XXX toshok why oh *why* god WHY did they do this? no fucking @@ -90,8 +91,6 @@ #include "e-util/e-util.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-util-private.h" -#include <gtk/gtkmessagedialog.h> -#include <glib/gi18n.h> #include <libedataserverui/e-passwords.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index f711155231..eee8f645e5 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -26,13 +26,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtklabel.h> -#include <gnome.h> #include <glade/glade.h> #include <misc/e-map.h> #include <libecal/e-cal-time-util.h> diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h index 7ce78c381a..aac919f203 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.h +++ b/widgets/e-timezone-dialog/e-timezone-dialog.h @@ -22,7 +22,7 @@ #ifndef __E_TIMEZONE_DIALOG_H__ #define __E_TIMEZONE_DIALOG_H__ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <libical/ical.h> diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index cbd6d23e06..8d099df961 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -23,8 +23,6 @@ #include <config.h> -#include <gtk/gtk.h> -#include <gtk/gtklabel.h> #include <glib/gi18n.h> #include "e-util/e-util.h" diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index e353886d21..bc92350a52 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -24,9 +24,7 @@ #ifndef __GAL_DEFINE_VIEWS_DIALOG_H__ #define __GAL_DEFINE_VIEWS_DIALOG_H__ -#include <gtk/gtkdialog.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include <widgets/menus/gal-view-collection.h> diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index d5a1e493ef..23d2248958 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_SET_H_ #define _GAL_VIEW_SET_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <widgets/menus/gal-view-factory.h> G_BEGIN_DECLS diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index 83d1259fca..0209a17995 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_ETABLE_H_ #define _GAL_VIEW_ETABLE_H_ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include <widgets/menus/gal-view.h> #include <table/e-table-state.h> #include <table/e-table-specification.h> diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index 2535ef01b4..c85927969d 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_FACTORY_ETABLE_H_ #define _GAL_VIEW_FACTORY_ETABLE_H_ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include <widgets/menus/gal-view-factory.h> #include <table/e-table-specification.h> diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index 939917d488..739695bea5 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_FACTORY_H_ #define _GAL_VIEW_FACTORY_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <widgets/menus/gal-view.h> #ifdef __cplusplus diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 7fcaf6699d..9e207c9104 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -23,8 +23,6 @@ #include <config.h> -#include <gtk/gtk.h> - #include <glib/gi18n.h> #include "e-util/e-util.h" #include "e-util/e-util-private.h" diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index f3d30ad7d0..a96d5bc9ed 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -24,10 +24,8 @@ #ifndef __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ #define __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <glade/glade.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtktreemodel.h> #include <widgets/menus/gal-view-collection.h> #include <widgets/menus/gal-view-instance.h> diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index f1ebf1cdfa..1612cb91e6 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_INSTANCE_H_ #define _GAL_VIEW_INSTANCE_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <widgets/menus/gal-view-collection.h> #include <misc/e-popup-menu.h> diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 5fab621174..dfc3e87159 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -23,8 +23,6 @@ #include <config.h> -#include <gtk/gtk.h> - #include "table/e-table-scrolled.h" #include <glib/gi18n.h> #include "e-util/e-util.h" diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 3d898d45cd..a8b493799c 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -24,8 +24,7 @@ #ifndef __GAL_VIEW_NEW_DIALOG_H__ #define __GAL_VIEW_NEW_DIALOG_H__ -#include <gtk/gtkdialog.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> #include <glade/glade.h> #include <gal-view-collection.h> diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index bad347e824..ae682c7395 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -24,7 +24,7 @@ #ifndef _GAL_VIEW_H_ #define _GAL_VIEW_H_ -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libxml/tree.h> #ifdef __cplusplus diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 08eecebc26..e9aae8614d 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -551,9 +551,9 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, unsigned int activity_id; GSList *p; char *information = g_object_get_data((GObject *) error, "primary"); - priv = activity_handler->priv; const char *img; + priv = activity_handler->priv; activity_id = get_new_activity_id (activity_handler); activity_info = activity_info_new (component_id, activity_id, NULL, information, TRUE); diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index b48d528428..7991877693 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -26,8 +26,6 @@ #include <config.h> #endif -#include <glib.h> - #ifdef G_OS_WIN32 /* Include <windows.h> early (as the gio stuff below will * include it anyway, sigh) to workaround the DATADIR problem. @@ -46,11 +44,6 @@ #include <errno.h> #include <camel/camel.h> -#include <gtk/gtk.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkdialog.h> -#include <gio/gio.h> #include <glib/gi18n.h> #include <glib/gstdio.h> diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index d2cf892c11..743f445694 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -25,13 +25,11 @@ #ifndef __E_ATTACHMENT_H__ #define __E_ATTACHMENT_H__ -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <glade/glade-xml.h> #include <camel/camel-mime-part.h> #include <camel/camel-exception.h> #include <camel/camel-cipher-context.h> -#include <gio/gio.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 73e201e694..47f685a9da 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -36,12 +36,7 @@ #include <time.h> #include <string.h> -#include <glib.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtklabel.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <libedataserver/e-data-server-util.h> diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index 3fe1ff1596..80e6d653e0 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -36,12 +36,7 @@ #include "e-calendar.h" -#include <glib.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkpixmap.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-widget.h> #include <glib/gi18n.h> diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index a31fccceff..3c80401775 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -23,7 +23,7 @@ #ifndef _E_CALENDAR_H_ #define _E_CALENDAR_H_ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <misc/e-canvas.h> #include "e-calendar-item.h" diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index 6fb7ab3852..5490cec1d7 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -24,7 +24,7 @@ #ifndef __E_CANVAS_VBOX_H__ #define __E_CANVAS_VBOX_H__ -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #ifdef __cplusplus diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 63b0fb3107..6b10a8c46b 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -24,7 +24,7 @@ #ifndef __E_CANVAS_H__ #define __E_CANVAS_H__ -#include <gtk/gtkimcontext.h> +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #ifdef __cplusplus diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c index e1d7ea0034..aea4209995 100644 --- a/widgets/misc/e-cell-renderer-combo.c +++ b/widgets/misc/e-cell-renderer-combo.c @@ -24,10 +24,6 @@ #include <config.h> #endif -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkbutton.h> - #include "e-combo-cell-editable.h" #include "e-cell-renderer-combo.h" diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h index 6b4b161c29..822b55a6a6 100644 --- a/widgets/misc/e-cell-renderer-combo.h +++ b/widgets/misc/e-cell-renderer-combo.h @@ -23,7 +23,7 @@ #ifndef __E_CELL_RENDERER_COMBO_H__ #define __E_CELL_RENDERER_COMBO_H__ -#include <gtk/gtkcellrenderertext.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c index 69664f6a1e..c9fd0cc535 100644 --- a/widgets/misc/e-colors.c +++ b/widgets/misc/e-colors.c @@ -27,8 +27,6 @@ #include <config.h> -#include <gtk/gtk.h> - #include "e-colors.h" GdkColor e_white, e_dark_gray, e_black; diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 6427b62480..a82eadc4d5 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -24,9 +24,7 @@ #ifndef GNOME_APP_LIBS_COLOR_H #define GNOME_APP_LIBS_COLOR_H -#include <glib.h> -#include <gdk/gdk.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index 541d476d2e..91e6e2e8cd 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -28,14 +28,6 @@ #include "ea-widgets.h" #include <e-util/e-icon-factory.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkimage.h> -#include <gtk/gtksignal.h> - struct _EComboButtonPrivate { GdkPixbuf *icon; diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h index f8b27f7dde..f0de2d05ce 100644 --- a/widgets/misc/e-combo-button.h +++ b/widgets/misc/e-combo-button.h @@ -27,10 +27,7 @@ #include <config.h> #endif -#include <gtk/gtkbutton.h> -#include <gtk/gtkmenu.h> - -#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c index 1abfbbd61a..ff8949d577 100644 --- a/widgets/misc/e-combo-cell-editable.c +++ b/widgets/misc/e-combo-cell-editable.c @@ -22,18 +22,6 @@ #include <config.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkcelleditable.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmain.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkwindow.h> #include "e-combo-cell-editable.h" diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h index 7d3b4d731b..12192d33f6 100644 --- a/widgets/misc/e-combo-cell-editable.h +++ b/widgets/misc/e-combo-cell-editable.h @@ -23,7 +23,7 @@ #ifndef __E_COMBO_CELL_EDITABLE_H__ #define __E_COMBO_CELL_EDITABLE_H__ -#include <gtk/gtkeventbox.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h index 957d314d5b..f7cce532e7 100644 --- a/widgets/misc/e-config-page.h +++ b/widgets/misc/e-config-page.h @@ -27,7 +27,7 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 4c982f3d3c..185fb1423d 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -42,21 +42,6 @@ #include <stdlib.h> #include <string.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkbbox.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkcomboboxentry.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtkdrawingarea.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkmessagedialog.h> #include <atk/atkrelation.h> #include <atk/atkrelationset.h> #include <glib/gi18n.h> diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h index e9a3d715c7..65f5805fc2 100644 --- a/widgets/misc/e-dateedit.h +++ b/widgets/misc/e-dateedit.h @@ -41,9 +41,7 @@ #define __E_DATE_EDIT_H_ #include <time.h> -#include <glib.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #define E_TYPE_DATE_EDIT (e_date_edit_get_type ()) #define E_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit)) diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index dad8cc723f..739f7ef95d 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -29,11 +29,6 @@ #include "e-dropdown-button.h" #include <stdio.h> -#include <gtk/gtkarrow.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkwidget.h> #include <libgnomeui/gnome-popup-menu.h> struct _EDropdownButtonPrivate { diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h index 2571913e2d..7ec9ed2786 100644 --- a/widgets/misc/e-dropdown-button.h +++ b/widgets/misc/e-dropdown-button.h @@ -27,8 +27,7 @@ #include <config.h> #endif -#include <gtk/gtktogglebutton.h> -#include <gtk/gtkmenu.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-expander.c b/widgets/misc/e-expander.c index 7c60c28d4b..7886e23859 100644 --- a/widgets/misc/e-expander.c +++ b/widgets/misc/e-expander.c @@ -26,8 +26,6 @@ #include "e-expander.h" #include "ea-widgets.h" -#include <gtk/gtklabel.h> -#include <gtk/gtkcontainer.h> #include <gdk/gdkkeysyms.h> #define DEFAULT_EXPANDER_SIZE 10 diff --git a/widgets/misc/e-expander.h b/widgets/misc/e-expander.h index d3e6721b23..b7aa330d28 100644 --- a/widgets/misc/e-expander.h +++ b/widgets/misc/e-expander.h @@ -24,7 +24,7 @@ #ifndef _E_EXPANDER_H_ #define _E_EXPANDER_H_ -#include <gtk/gtkbin.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index 7c23362223..46d96db825 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -24,9 +24,7 @@ #ifndef GAL_GUI_UTILS_H #define GAL_GUI_UTILS_H -#include <gtk/gtkmenu.h> -#include <gtk/gtkwindow.h> - +#include <gtk/gtk.h> #include <glade/glade-xml.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index c246edc04c..8a30d5505f 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -36,12 +36,6 @@ #include "e-icon-entry.h" -#include <gtk/gtkentry.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkeventbox.h> -#include <gtk/gtkimage.h> - #define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate)) struct _EIconEntryPrivate diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h index db3f01dc56..5312fa4fbc 100644 --- a/widgets/misc/e-icon-entry.h +++ b/widgets/misc/e-icon-entry.h @@ -37,7 +37,7 @@ #ifndef E_ICON_ENTRY_H #define E_ICON_ENTRY_H -#include <gtk/gtkbin.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index b80da133ec..06e70c9426 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -23,12 +23,6 @@ #include <stdio.h> #include <string.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkdnd.h> - #include <glib/gi18n.h> #include "e-image-chooser.h" diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index ff876038ae..4f6fcece82 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -21,7 +21,7 @@ #ifndef _E_IMAGE_CHOOSER_H_ #define _E_IMAGE_CHOOSER_H_ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index 8e08386ba7..57a2492671 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -24,10 +24,8 @@ #endif #include <string.h> -#include <gtk/gtkimage.h> #include "e-info-label.h" -#include <gtk/gtklabel.h> #include <e-util/e-icon-factory.h> diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h index c5da3fef19..a131823df8 100644 --- a/widgets/misc/e-info-label.h +++ b/widgets/misc/e-info-label.h @@ -22,7 +22,7 @@ #ifndef _E_INFO_LABEL_H #define _E_INFO_LABEL_H -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 3c7005dc00..e717a9434c 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -24,8 +24,6 @@ #include <math.h> #include <stdlib.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtksignal.h> -#include <gdk-pixbuf/gdk-pixbuf.h> #include <glib/gi18n.h> #include "e-util/e-util-private.h" diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h index 9b67a24e6f..bf0afee024 100644 --- a/widgets/misc/e-map.h +++ b/widgets/misc/e-map.h @@ -23,7 +23,7 @@ #ifndef E_MAP_H #define E_MAP_H -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #define TYPE_E_MAP (e_map_get_type ()) #define E_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_E_MAP, EMap)) diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 762b87bc77..101f7ee04b 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -32,8 +32,7 @@ #include <table/e-cell-vbox.h> #include <table/e-cell-text.h> -#include <gdk-pixbuf/gdk-pixbuf.h> - +#include <libgnome/gnome-help.h> #define SWITCH_PAGE_INTERVAL 250 diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h index 0847576ab5..737406c1c1 100644 --- a/widgets/misc/e-multi-config-dialog.h +++ b/widgets/misc/e-multi-config-dialog.h @@ -29,8 +29,7 @@ #include "e-config-page.h" -#include <gtk/gtkdialog.h> -#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 7153e36efd..d5580ea524 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -26,8 +26,7 @@ #ifndef E_POPUP_MENU_H #define E_POPUP_MENU_H -#include <gtk/gtkmenu.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h index cadefc81c0..acf174dcea 100644 --- a/widgets/misc/e-printable.h +++ b/widgets/misc/e-printable.h @@ -24,7 +24,6 @@ #ifndef _E_PRINTABLE_H_ #define _E_PRINTABLE_H_ -#include <gtk/gtkobject.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 3361e4ea90..a40c626ab9 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -30,15 +30,6 @@ #endif #include <gdk/gdkkeysyms.h> -#include <gtk/gtkdrawingarea.h> -#include <gtk/gtkeventbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkversion.h> #include <misc/e-unicode.h> #include <misc/e-gui-utils.h> diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 7c4144ce2f..c2de0b36b8 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -20,8 +20,7 @@ #ifndef __E_SEARCH_BAR_H__ #define __E_SEARCH_BAR_H__ -#include <gtk/gtkhbox.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include <bonobo/bonobo-ui-component.h> diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 8d729267f1..9ecc41dec2 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -24,7 +24,7 @@ #ifndef _E_SELECTION_MODEL_ARRAY_H_ #define _E_SELECTION_MODEL_ARRAY_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <misc/e-selection-model.h> #include <e-util/e-bit-array.h> diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index e9b76723f2..2bf31460db 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -24,9 +24,8 @@ #ifndef _E_SELECTION_MODEL_H_ #define _E_SELECTION_MODEL_H_ -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> #include <e-util/e-sorter.h> -#include <gdk/gdkevents.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index cb84f1e5b0..9f8c23ba53 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -23,10 +23,6 @@ #endif #include <string.h> -#include <glib.h> -#include <gtk/gtksignal.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtk.h> #include <libgnome/libgnome.h> #include <glib/gi18n.h> #include <glade/glade.h> diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h index 9817ff61b1..8e0597d409 100644 --- a/widgets/misc/e-send-options.h +++ b/widgets/misc/e-send-options.h @@ -22,7 +22,6 @@ #ifndef __E_SENDOPTIONS_DIALOG_H__ #define __E_SENDOPTIONS_DIALOG_H__ -#include <gtk/gtkwidget.h> #include <gtk/gtk.h> #include <time.h> diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index c5a247044d..26a77e6126 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -36,11 +36,6 @@ #define START_PROFILER(name) #define STOP_PROFILER(name) -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <gtk/gtkicontheme.h> -#include <gtk/gtkiconfactory.h> -#include <gtk/gtksettings.h> - #include "e-util/e-icon-factory.h" /* Spinner cache implementation */ diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h index e438b43aab..5a1cd42c5e 100644 --- a/widgets/misc/e-spinner.h +++ b/widgets/misc/e-spinner.h @@ -28,8 +28,7 @@ #ifndef E_SPINNER_H #define E_SPINNER_H -#include <gtk/gtkwidget.h> -#include <gtk/gtkenums.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index a03b58c2fa..d1635aa7cd 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -26,10 +26,6 @@ #include "e-task-bar.h" -#include <gtk/gtkiconfactory.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmisc.h> - struct _ETaskBarPrivate { GtkWidget *message_label; diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h index 0ef0c18049..bc3a10b09d 100644 --- a/widgets/misc/e-task-bar.h +++ b/widgets/misc/e-task-bar.h @@ -25,7 +25,7 @@ #include "e-task-widget.h" -#include <gtk/gtkhbox.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 7b06e9a464..8fbba6e36d 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -28,14 +28,6 @@ #include "e-spinner.h" #include <e-util/e-icon-factory.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkimage.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtktoolbutton.h> -#include <gtk/gtkbox.h> - #include <glib/gi18n.h> diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index 5d1864050c..af2c376634 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -23,8 +23,7 @@ #ifndef _E_TASK_WIDGET_H_ #define _E_TASK_WIDGET_H_ -#include <gtk/gtkeventbox.h> -#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtk.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 1021905f16..d26ac3e14d 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -29,9 +29,7 @@ #include <config.h> #endif -#include <gtk/gtkdnd.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-ui-init.h> diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index f5017c223c..bb85d4aecc 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -29,11 +29,7 @@ #include <config.h> #endif -#include <glib.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkmain.h> -#include <gtk/gtktable.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnomeui/gnome-app.h> #include "e-dateedit.h" diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c index 80c6a37a14..c169a0d09d 100644 --- a/widgets/misc/test-dropdown-button.c +++ b/widgets/misc/test-dropdown-button.c @@ -27,11 +27,7 @@ #endif #include <stdio.h> -#include <glib.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-app-helper.h> diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c index 1557a27889..55fbfcc309 100644 --- a/widgets/misc/test-info-label.c +++ b/widgets/misc/test-info-label.c @@ -24,11 +24,7 @@ #include <config.h> #endif -#include <gtk/gtkbox.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtklabel.h> - +#include <gtk/gtk.h> #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-ui-init.h> #include <e-util/e-icon-factory.h> diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c index 9fa90b1143..c0aba09ab9 100644 --- a/widgets/misc/test-multi-config-dialog.c +++ b/widgets/misc/test-multi-config-dialog.c @@ -23,7 +23,9 @@ #include "e-multi-config-dialog.c" -#include <gnome.h> +#include <gtk/gtk.h> +#include <libgnomeui/gnome-app.h> +#include <libgnomeui/gnome-ui-init.h> #define NUM_PAGES 10 diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h index 6bbd79bc99..df64d9007d 100644 --- a/widgets/table/e-cell-spin-button.h +++ b/widgets/table/e-cell-spin-button.h @@ -30,8 +30,7 @@ #ifndef __E_CELL_SPIN_BUTTON_H__ #define __E_CELL_SPIN_BUTTON_H__ -#include <glib.h> -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #include <table/e-cell.h> #define E_CELL_SPIN_BUTTON_TYPE (e_cell_spin_button_get_type ()) diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index 93b958be0d..d92d02b7c8 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -36,7 +36,8 @@ #ifndef _E_CELL_TEXT_H_ #define _E_CELL_TEXT_H_ -#include <gtk/gtkmenu.h> + +#include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> #include <table/e-cell.h> diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index b92e493e19..65be53f816 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -25,7 +25,6 @@ #ifndef _E_CELL_H_ #define _E_CELL_H_ -#include <gdk/gdktypes.h> #include <gtk/gtk.h> #include <table/e-table-model.h> #include <table/e-table-tooltip.h> diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index ca81b5bb6d..47c730c925 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -30,7 +30,7 @@ #include <table/e-table-without.h> #include <table/e-table-subset-variable.h> #include <table/e-table.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 32012e4494..e175a5d17f 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -24,7 +24,7 @@ #ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__ #define __E_TABLE_FIELD_CHOOSER_DIALOG_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <table/e-table-field-chooser.h> #include <table/e-table-header.h> diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index f6dca643d7..928558b75e 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -25,7 +25,7 @@ #define __E_TABLE_FIELD_CHOOSER_H__ #include <glade/glade.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index 1c7c0b48fd..239fc15d1e 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_SCROLLED_H_ #define _E_TABLE_SCROLLED_H_ -#include <gtk/gtkscrolledwindow.h> +#include <gtk/gtk.h> #include <table/e-table-model.h> #include <table/e-table.h> diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h index ecb3efa6e9..67fddac8a3 100644 --- a/widgets/table/e-table-search.h +++ b/widgets/table/e-table-search.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_SEARCH_H_ #define _E_TABLE_SEARCH_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 60b7812413..075939a8a5 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_SELECTION_MODEL_H_ #define _E_TABLE_SELECTION_MODEL_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <misc/e-selection-model-array.h> #include <table/e-table-model.h> #include <table/e-table-header.h> diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index 57d6a4cfe2..7788509b7b 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_WITHOUT_H_ #define _E_TABLE_WITHOUT_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <table/e-table-subset.h> #ifdef __cplusplus diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 7d6bb2a97e..5e7f3544bb 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -26,8 +26,7 @@ #define _E_TABLE_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gtk/gtkdnd.h> -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libxml/tree.h> #include <table/e-table-model.h> #include <table/e-table-header.h> diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index 9671061222..1e35828989 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -24,7 +24,7 @@ #ifndef _E_TREE_SCROLLED_H_ #define _E_TREE_SCROLLED_H_ -#include <gtk/gtkscrolledwindow.h> +#include <gtk/gtk.h> #include <table/e-tree-model.h> #include <table/e-tree.h> diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index 2920ac6a9e..ffac924ad3 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -24,8 +24,7 @@ #ifndef _E_TREE_SELECTION_MODEL_H_ #define _E_TREE_SELECTION_MODEL_H_ -#include <gdk/gdktypes.h> -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <e-util/e-sorter.h> #include <misc/e-selection-model.h> #include <table/e-tree-model.h> diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 03c67a0563..f497b4721f 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -24,8 +24,7 @@ #ifndef _E_TREE_H_ #define _E_TREE_H_ -#include <gtk/gtkdnd.h> -#include <gtk/gtktable.h> +#include <gtk/gtk.h> #include <libxml/tree.h> #include <libgnomecanvas/gnome-canvas.h> #include <misc/e-printable.h> diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index d45e3f37cd..98965f94d5 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -24,8 +24,7 @@ #ifndef E_TEXT_MODEL_H #define E_TEXT_MODEL_H -#include <glib.h> -#include <gtk/gtkobject.h> +#include <glib-object.h> G_BEGIN_DECLS diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 60e28a0b44..c4c4b89f1b 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -37,7 +37,7 @@ #ifndef E_TEXT_H #define E_TEXT_H -#include <gtk/gtkmenu.h> +#include <gtk/gtk.h> #include <e-util/e-text-event-processor.h> #include <text/e-text-model.h> |