diff options
Diffstat (limited to 'calendar')
95 files changed, 84 insertions, 299 deletions
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> |