diff options
Diffstat (limited to 'calendar')
88 files changed, 132 insertions, 298 deletions
diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index 775a3693cb..2ff5b3dd46 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -12,7 +12,6 @@ evolution_alarm_notify_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ @@ -21,7 +20,9 @@ evolution_alarm_notify_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - $(CANBERRA_CFLAGS) + $(CANBERRA_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) ui_DATA = \ alarm-notify.ui @@ -44,17 +45,17 @@ evolution_alarm_notify_SOURCES = \ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(LIBNOTIFY_LIBS) \ $(CANBERRA_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) $(EVOLUTIONALARMNOTIFYICON) if OS_WIN32 diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index 3bb705a772..ac6ce49d93 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -30,14 +30,12 @@ #include <string.h> #include <glib/gi18n.h> +#include "e-util/e-util.h" + #include "alarm-notify-dialog.h" #include "config-data.h" #include "util.h" -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "misc/e-buffer-tagger.h" - enum { ALARM_DISPLAY_COLUMN, ALARM_SUMMARY_COLUMN, diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c index 54242f2049..ce7efee9ac 100644 --- a/calendar/alarm-notify/alarm-notify.c +++ b/calendar/alarm-notify/alarm-notify.c @@ -27,6 +27,8 @@ #include <string.h> #include <camel/camel.h> +#include "e-util/e-util.h" + #include "alarm.h" #include "alarm-notify.h" #include "alarm-queue.h" diff --git a/calendar/alarm-notify/alarm-notify.h b/calendar/alarm-notify/alarm-notify.h index 61097f310a..45de689a4e 100644 --- a/calendar/alarm-notify/alarm-notify.h +++ b/calendar/alarm-notify/alarm-notify.h @@ -28,7 +28,6 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define TYPE_ALARM_NOTIFY \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 75991807df..f1c0727ab1 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -58,8 +58,6 @@ libevolution_calendar_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/misc \ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ @@ -70,6 +68,7 @@ libevolution_calendar_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) @@ -205,18 +204,13 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LIBSOUP_LIBS) diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 1bc62730ab..15b6024931 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -32,8 +32,7 @@ #include <time.h> #include <string.h> #include <gio/gio.h> -#include <e-util/e-util.h> -#include <widgets/e-timezone-dialog/e-timezone-dialog.h> + #include <shell/e-shell.h> #include "calendar-config-keys.h" diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index c005ec399e..cd492c1480 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -32,7 +32,7 @@ #include <gdk/gdk.h> #include <libecal/libecal.h> -#include <e-util/e-util-enums.h> +#include <e-util/e-util.h> /* These are used to get/set the working days in the week. The bit-flags are * combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h index bad3dcfd1f..833c4bd281 100644 --- a/calendar/gui/calendar-view-factory.h +++ b/calendar/gui/calendar-view-factory.h @@ -26,7 +26,6 @@ #ifndef CALENDAR_VIEW_FACTORY_H #define CALENDAR_VIEW_FACTORY_H -#include <menus/gal-view-factory.h> #include "gnome-cal.h" G_BEGIN_DECLS diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index f3a2a3103b..d76f3f5449 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -26,7 +26,6 @@ #ifndef CALENDAR_VIEW_H #define CALENDAR_VIEW_H -#include <menus/gal-view.h> #include "gnome-cal.h" G_BEGIN_DECLS diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index c0935ca4e5..c0e6dbb74c 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -28,12 +28,10 @@ #include <string.h> #include <time.h> -#include <libedataserverui/libedataserverui.h> #include "calendar-config.h" #include "comp-util.h" #include "dialogs/delete-comp.h" -#include "e-util/e-categories-config.h" #include "gnome-cal.h" #include "shell/e-shell-window.h" diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index ff7a1351d3..1c91a69d64 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -28,7 +28,7 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <e-util/e-util-enums.h> +#include <e-util/e-util.h> struct _EShell; diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 02af20b87b..fa6ba86e6b 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -4,18 +4,18 @@ libcal_dialogs_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_srcdir)/calendar \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ - -I$(top_srcdir)/widgets/misc \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs @@ -50,10 +50,11 @@ ecalendarinclude_HEADERS = \ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) libcal_dialogs_la_SOURCES = \ - $(IDL_GENERATED) \ alarm-dialog.c \ alarm-dialog.h \ alarm-list-dialog.c \ diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index dda1d8548b..d88fd12fb6 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -32,12 +32,11 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> -#include "e-util/e-util.h" -#include "e-util/e-dialog-widgets.h" -#include "e-util/e-util-private.h" #include <libical/icalattach.h> + +#include "e-util/e-util.h" + #include "../calendar-config.h" #include "comp-editor-util.h" #include "alarm-dialog.h" diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 5dbdb0ef8e..29038f4483 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -26,10 +26,12 @@ #include <config.h> #endif +#include "cancel-comp.h" + #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "libevolution-utils/e-alert-dialog.h" -#include "cancel-comp.h" + +#include "e-util/e-util.h" /* is_past_event: * diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h index bfc1c6cbc4..5e6ea88076 100644 --- a/calendar/gui/dialogs/cancel-comp.h +++ b/calendar/gui/dialogs/cancel-comp.h @@ -26,6 +26,7 @@ #ifndef CANCEL_COMP_H #define CANCEL_COMP_H +#include <gtk/gtk.h> #include <libecal/libecal.h> gboolean cancel_component_dialog (GtkWindow *parent, ECalClient *cal_client, ECalComponent *comp, gboolean deleting); diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 5938f52e14..52651190ac 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -31,9 +31,9 @@ #include <libical/ical.h> #include <glib/gi18n.h> -#include "widgets/misc/e-dateedit.h" +#include "shell/e-shell.h" + #include "../itip-utils.h" -#include <shell/e-shell.h> #include "comp-editor-util.h" /** diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index a4ecc468a7..8c80683696 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -28,7 +28,6 @@ #include <gtk/gtk.h> #include "comp-editor.h" #include "../e-meeting-attendee.h" -#include <misc/e-dateedit.h> void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp); void comp_editor_free_dates (CompEditorPageDates *dates); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 4eaf1bce75..5fa87e861a 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -38,10 +38,6 @@ #include <gdk/gdkkeysyms.h> #include <libebackend/libebackend.h> -#include <e-util/e-util.h> -#include <libevolution-utils/e-alert-sink.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> #include <shell/e-shell.h> #include "../print.h" @@ -55,11 +51,6 @@ #include "comp-editor.h" #include "comp-editor-util.h" #include "../calendar-config-keys.h" -#include "widgets/misc/e-attachment-view.h" -#include "widgets/misc/e-attachment-paned.h" - -#include "libevolution-utils/e-alert-dialog.h" -#include "e-util/e-ui-manager.h" #define COMP_EDITOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 14fbc0ff5b..72598acfe0 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -28,10 +28,10 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> +#include <shell/e-shell.h> + #include "../itip-utils.h" #include "comp-editor-page.h" -#include <shell/e-shell.h> -#include <misc/e-focus-tracker.h> /* Standard GObject macros */ #define TYPE_COMP_EDITOR \ diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 5a7889e138..f8b668b933 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -27,7 +27,8 @@ #endif #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> + +#include "e-util/e-util.h" #include "copy-source-dialog.h" #include "select-source-dialog.h" diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 93e2df0d91..0ec054cd39 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -26,10 +26,12 @@ #include <config.h> #endif -#include <glib/gi18n.h> -#include "libevolution-utils/e-alert-dialog.h" #include "delete-comp.h" +#include <glib/gi18n.h> + +#include "e-util/e-util.h" + /** * delete_component_dialog: * @comp: A calendar component if a single component is to be deleted, or NULL diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 9ae253dc00..9c5e17f59e 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -29,7 +29,6 @@ #include <gtk/gtk.h> #include <libical/ical.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> #include "e-util/e-util.h" #include "e-util/e-util-private.h" diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index f5c3f0a408..6d365b3424 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -27,7 +27,7 @@ #include <libecal/libecal.h> -#include "misc/e-send-options.h" +#include <e-util/e-util.h> void e_send_options_utils_set_default_data (ESendOptionsDialog *sod, diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 0681aa4ed7..2ea6297dcc 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -32,11 +32,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <misc/e-dateedit.h> -#include <e-util/e-plugin-ui.h> -#include <e-util/e-util-private.h> -#include <e-util/e-ui-manager.h> - #include "event-page.h" #include "recurrence-page.h" #include "schedule-page.h" diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 12931cee09..793e98e49e 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -35,19 +35,6 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libedataserverui/libedataserverui.h> - -#include <e-util/e-util.h> -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-dialog-widgets.h> -#include <e-util/e-util-private.h> - -#include <misc/e-dateedit.h> -#include <misc/e-send-options.h> -#include <misc/e-spell-entry.h> -#include <misc/e-buffer-tagger.h> - #include "../e-alarm-list.h" #include "../e-meeting-attendee.h" #include "../e-meeting-list-view.h" diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index ae0d351618..839bce7bed 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -31,9 +31,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <e-util/e-plugin-ui.h> -#include <e-util/e-util-private.h> - #include "memo-page.h" #include "cancel-comp.h" #include "memo-editor.h" diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index ec99587f4e..79b659a898 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -34,17 +34,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> - -#include <e-util/e-util.h> -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> - -#include <misc/e-dateedit.h> -#include <misc/e-spell-entry.h> -#include <misc/e-buffer-tagger.h> - #include "../calendar-config.h" #include "comp-editor.h" #include "comp-editor-util.h" diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 77862c6584..d5a93ea9db 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -33,17 +33,12 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <misc/e-dateedit.h> #include "../tag-calendar.h" #include "../weekday-picker.h" #include "comp-editor-util.h" #include "../e-date-time-list.h" #include "recurrence-page.h" -#include "e-util/e-util.h" -#include "e-util/e-dialog-widgets.h" -#include "e-util/e-util-private.h" - #define RECURRENCE_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_RECURRENCE_PAGE, RecurrencePagePrivate)) diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 2fd53bd5db..3ae26252b7 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -25,7 +25,6 @@ #include <config.h> #endif -#include "libevolution-utils/e-alert-dialog.h" #include "save-comp.h" #include "comp-editor.h" diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 516a973751..bd3e05e171 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -31,8 +31,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <e-util/e-util-private.h> -#include <misc/e-dateedit.h> + #include "../e-meeting-time-sel.h" #include "../itip-utils.h" #include "comp-editor-util.h" diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index 1c554364fa..9d38de4a23 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -28,7 +28,6 @@ #include "../e-meeting-store.h" #include "comp-editor.h" #include "comp-editor-page.h" -#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define TYPE_SCHEDULE_PAGE \ diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index 9f80038e8b..5bdf4a7c5e 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -26,7 +26,8 @@ #endif #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> + +#include "e-util/e-util.h" #include "select-source-dialog.h" diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 73938be875..b69e6eaade 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -26,10 +26,12 @@ #include <config.h> #endif -#include <glib/gi18n-lib.h> -#include "libevolution-utils/e-alert-dialog.h" #include "send-comp.h" +#include <glib/gi18n-lib.h> + +#include "e-util/e-util.h" + static gboolean component_has_new_attendees (ECalComponent *comp) { diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 2ada645842..e40db5ba86 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -31,16 +31,11 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <misc/e-dateedit.h> -#include <misc/e-url-entry.h> + #include "../e-timezone-entry.h" #include "comp-editor-util.h" #include "task-details-page.h" -#include "e-util/e-util.h" -#include "e-util/e-dialog-widgets.h" -#include "e-util/e-util-private.h" - #define TASK_DETAILS_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate)) diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 0c81d3ea47..07ad568f9d 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -32,9 +32,6 @@ #include <string.h> #include <glib/gi18n.h> -#include "e-util/e-plugin-ui.h" -#include "e-util/e-util-private.h" - #include "task-page.h" #include "task-details-page.h" #include "cancel-comp.h" diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index ebf279cb22..d8d64f32d6 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -34,17 +34,6 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libedataserverui/libedataserverui.h> - -#include <misc/e-dateedit.h> -#include <misc/e-spell-entry.h> -#include <misc/e-buffer-tagger.h> - -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> -#include <e-util/e-util.h> - #include "../e-meeting-attendee.h" #include "../e-meeting-list-view.h" #include "../e-meeting-store.h" diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index fe9870e1d8..0647f9bcab 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -33,9 +33,6 @@ #include <glib/gi18n.h> #include <camel/camel.h> -#include <e-util/e-util.h> -#include <e-util/e-categories-config.h> - #define E_CAL_COMPONENT_PREVIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreviewPrivate)) diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 5048e3ab07..54909139ec 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -26,7 +26,8 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <misc/e-web-view.h> + +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CAL_COMPONENT_PREVIEW \ diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 5cadd428a1..e6db09ad6e 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -25,8 +25,7 @@ #define E_CAL_CONFIG_H #include <libecal/libecal.h> - -#include "e-util/e-config.h" +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CAL_CONFIG \ diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index 447f1fd418..f44878d01f 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -24,8 +24,7 @@ #ifndef __E_CAL_EVENT_H__ #define __E_CAL_EVENT_H__ -#include "e-util/e-event.h" -#include "shell/e-shell-backend.h" +#include <shell/e-shell-backend.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 55280ce79c..94722c0319 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -34,16 +34,6 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <table/e-table-memory-store.h> -#include <table/e-cell-checkbox.h> -#include <table/e-cell-toggle.h> -#include <table/e-cell-text.h> -#include <table/e-cell-combo.h> -#include <table/e-cell-date.h> -#include <table/e-cell-date-edit.h> -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> #include "e-cal-model-calendar.h" #include "e-cell-date-edit-text.h" diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index ed4636f753..e5eff477a2 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -27,8 +27,7 @@ #include <time.h> #include <gtk/gtk.h> -#include <table/e-table.h> -#include <table/e-cell-date-edit.h> +#include <e-util/e-util.h> #include "e-calendar-view.h" #include "gnome-cal.h" diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 7f19e00c16..9164d9c06e 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -28,8 +28,8 @@ #include <libecal/libecal.h> -#include <e-util/e-util-enums.h> -#include <table/e-table-model.h> +#include <e-util/e-util.h> + #include "e-cell-date-edit-text.h" /* Standard GObject macros */ diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c index 6c403e43a2..19eb4335b1 100644 --- a/calendar/gui/e-calendar-selector.c +++ b/calendar/gui/e-calendar-selector.c @@ -24,8 +24,6 @@ #include <libecal/libecal.h> -#include "e-util/e-selection.h" - #define E_CALENDAR_SELECTOR_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_CALENDAR_SELECTOR, ECalendarSelectorPrivate)) diff --git a/calendar/gui/e-calendar-selector.h b/calendar/gui/e-calendar-selector.h index 1e7128bbda..50832ead2b 100644 --- a/calendar/gui/e-calendar-selector.h +++ b/calendar/gui/e-calendar-selector.h @@ -21,7 +21,7 @@ #ifndef E_CALENDAR_SELECTOR_H #define E_CALENDAR_SELECTOR_H -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CALENDAR_SELECTOR \ diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 2801391952..d5ce9f362a 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -31,15 +31,7 @@ #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> #include <libebackend/libebackend.h> -#include <libedataserverui/libedataserverui.h> - -#include <e-util/e-util.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <e-util/e-selection.h> -#include <e-util/e-datetime-format.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-icon-factory.h> -#include <misc/e-selectable.h> + #include <shell/e-shell.h> #include "comp-util.h" diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index 82d94eff11..37e648ed76 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -32,9 +32,6 @@ #include <glib/gi18n.h> #include <libecal/libecal.h> -#include <e-util/e-util.h> -#include <e-util/e-datetime-format.h> - #include "e-cell-date-edit-text.h" #define E_CELL_DATE_EDIT_TEXT_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index aab7e27edf..b620143617 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -25,7 +25,7 @@ #define _E_CELL_DATE_EDIT_TEXT_H_ #include <libical/ical.h> -#include <table/e-cell-text.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CELL_DATE_EDIT_TEXT \ diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index 573a3b3ccd..c4bf94a512 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -31,7 +31,6 @@ #endif #include "e-day-view-layout.h" -#include "e-util/e-bit-array.h" static void e_day_view_layout_long_event (EDayViewEvent *event, guint8 *grid, diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 61e238eaa4..1492cdebd5 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -29,15 +29,13 @@ #include <config.h> #endif -#include <e-calendar-view.h> +#include "e-day-view-main-item.h" -#include "e-util/e-categories-config.h" -#include "e-util/e-util.h" +#include "comp-util.h" +#include "e-calendar-view.h" +#include "e-calendar-view.h" #include "e-day-view-layout.h" -#include "e-day-view-main-item.h" #include "ea-calendar.h" -#include "e-calendar-view.h" -#include "comp-util.h" #define E_DAY_VIEW_MAIN_ITEM_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index f337aa06e1..c6d36d36df 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -31,7 +31,6 @@ #include "e-day-view-time-item.h" #include "calendar-config.h" -#include <widgets/e-timezone-dialog/e-timezone-dialog.h> /* The spacing between items in the time column. GRID_X_PAD is the space down * either side of the column, i.e. outside the main horizontal grid lines. diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 8d961ea6a5..ed5d8b0266 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -29,7 +29,6 @@ #endif #include <glib/gi18n.h> -#include "e-util/e-categories-config.h" #include "e-calendar-view.h" #include "e-day-view-top-item.h" diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index db4557cbff..30eed74413 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -27,19 +27,14 @@ #endif #include "e-day-view.h" -#include "ea-calendar.h" #include <math.h> #include <time.h> -#include <gdk/gdkkeysyms.h> -#include <text/e-text.h> -#include <misc/e-canvas-utils.h> -#include <e-util/e-unicode.h> -#include <libgnomecanvas/libgnomecanvas.h> + #include <glib/gi18n.h> -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-selection.h> +#include <gdk/gdkkeysyms.h> + +#include "libgnomecanvas/libgnomecanvas.h" #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" @@ -47,17 +42,18 @@ #include "dialogs/cancel-comp.h" #include "dialogs/recur-comp.h" #include "dialogs/goto-dialog.h" -#include "print.h" + #include "calendar-config.h" #include "comp-util.h" -#include "itip-utils.h" #include "e-cal-model-calendar.h" -#include "e-day-view-time-item.h" -#include "e-day-view-top-item.h" #include "e-day-view-layout.h" #include "e-day-view-main-item.h" +#include "e-day-view-time-item.h" +#include "e-day-view-top-item.h" +#include "ea-calendar.h" +#include "itip-utils.h" #include "misc.h" -#include <e-util/e-icon-factory.h> +#include "print.h" /* The minimum amount of space wanted on each side of the date string. */ #define E_DAY_VIEW_DATE_X_PAD 4 diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 59ffa099e0..50999c767b 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -30,7 +30,6 @@ #include <glib/gi18n.h> #include <libecal/libecal.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> #include "calendar-config.h" #include "e-meeting-list-view.h" diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index d62cb05636..aff278c3bf 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -25,7 +25,6 @@ #define _E_MEETING_LIST_VIEW_H_ #include <gtk/gtk.h> -#include <libedataserverui/libedataserverui.h> #include "e-meeting-store.h" diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index b8e065e2dd..4e8e4e32d1 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -31,7 +31,6 @@ #include <libecal/libecal.h> #include <libebackend/libebackend.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <e-util/e-util-enumtypes.h> diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h index f762cbc7a5..27c1f9ac78 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -26,7 +26,8 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <e-util/e-util-enums.h> +#include <e-util/e-util.h> + #include "e-meeting-attendee.h" /* Standard GObject macros */ diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index a15f25a6ef..aaa86230cc 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -30,8 +30,6 @@ #include <time.h> #include <glib/gi18n.h> -#include "e-util/e-datetime-format.h" - #include "calendar-config.h" #include "e-meeting-time-sel-item.h" #include "e-meeting-time-sel.h" diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index f3f8b3a846..18944065e2 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -36,13 +36,6 @@ #include <libebackend/libebackend.h> #include <libgnomecanvas/libgnomecanvas.h> -#include "misc/e-canvas.h" -#include "misc/e-canvas-utils.h" -#include "misc/e-dateedit.h" - -#include "e-util/e-util.h" -#include "e-util/e-datetime-format.h" - #include "e-meeting-utils.h" #include "e-meeting-list-view.h" #include "e-meeting-time-sel-item.h" diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 7c3f7c3021..9f4fb0ac31 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -25,9 +25,9 @@ #include <gtk/gtk.h> #include <libgnomecanvas/libgnomecanvas.h> -#include <text/e-text.h> -#include <table/e-table-model.h> -#include <table/e-table.h> + +#include <e-util/e-util.h> + #include "e-meeting-store.h" #include "e-meeting-list-view.h" diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c index 8da45b68f3..366d41e702 100644 --- a/calendar/gui/e-memo-list-selector.c +++ b/calendar/gui/e-memo-list-selector.c @@ -25,7 +25,6 @@ #include <string.h> #include <libecal/libecal.h> -#include "e-util/e-selection.h" #include "calendar/gui/comp-util.h" #define E_MEMO_LIST_SELECTOR_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-memo-list-selector.h b/calendar/gui/e-memo-list-selector.h index f131d661cc..532fd312c6 100644 --- a/calendar/gui/e-memo-list-selector.h +++ b/calendar/gui/e-memo-list-selector.h @@ -26,7 +26,7 @@ #ifndef E_MEMO_LIST_SELECTOR_H #define E_MEMO_LIST_SELECTOR_H -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_MEMO_LIST_SELECTOR \ diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 45d51b9060..7d60f84877 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -30,32 +30,20 @@ #include <config.h> #endif +#include "e-memo-table.h" + #include <sys/stat.h> #include <unistd.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <misc/e-selectable.h> -#include <table/e-cell-checkbox.h> -#include <table/e-cell-toggle.h> -#include <table/e-cell-text.h> -#include <table/e-cell-combo.h> -#include <table/e-cell-date.h> -#include <e-util/e-selection.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> -#include <table/e-cell-date-edit.h> -#include <table/e-cell-percent.h> #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" #include "dialogs/memo-editor.h" #include "e-cal-model-memos.h" -#include "e-memo-table.h" #include "e-calendar-view.h" #include "e-cell-date-edit-text.h" #include "print.h" -#include <e-util/e-util-private.h> -#include <e-util/e-icon-factory.h> #include "misc.h" #define E_MEMO_TABLE_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 4f52ad35e4..f003aa6fff 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -25,9 +25,8 @@ #ifndef E_MEMO_TABLE_H #define E_MEMO_TABLE_H -#include <table/e-table.h> -#include <table/e-cell-date-edit.h> #include <shell/e-shell-view.h> + #include "e-cal-model.h" /* diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h index f168902db9..84732f7e72 100644 --- a/calendar/gui/e-select-names-editable.h +++ b/calendar/gui/e-select-names-editable.h @@ -24,8 +24,6 @@ #ifndef __E_SELECT_NAMES_EDITABLE_H__ #define __E_SELECT_NAMES_EDITABLE_H__ -#include <libedataserverui/libedataserverui.h> - G_BEGIN_DECLS #define E_TYPE_SELECT_NAMES_EDITABLE (e_select_names_editable_get_type ()) diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index 1b8bbbae48..0989e7436c 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -25,7 +25,6 @@ #include <string.h> #include <libecal/libecal.h> -#include "e-util/e-selection.h" #include "calendar/gui/comp-util.h" #define E_TASK_LIST_SELECTOR_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-task-list-selector.h b/calendar/gui/e-task-list-selector.h index fd133d1c10..df79d5f0ab 100644 --- a/calendar/gui/e-task-list-selector.h +++ b/calendar/gui/e-task-list-selector.h @@ -26,7 +26,7 @@ #ifndef E_TASK_LIST_SELECTOR_H #define E_TASK_LIST_SELECTOR_H -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_TASK_LIST_SELECTOR \ diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index ed73cbe6ef..cda4896292 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -29,36 +29,23 @@ #include <config.h> #endif +#include "e-task-table.h" + #include <sys/stat.h> #include <unistd.h> #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <misc/e-selectable.h> -#include <table/e-cell-checkbox.h> -#include <table/e-cell-toggle.h> -#include <table/e-cell-text.h> -#include <table/e-cell-combo.h> -#include <table/e-cell-date.h> -#include <e-util/e-selection.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util-private.h> -#include <table/e-cell-date-edit.h> -#include <table/e-cell-percent.h> -#include <table/e-table-sorting-utils.h> #include "calendar-config.h" #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" #include "dialogs/task-editor.h" #include "e-cal-model-tasks.h" -#include "e-task-table.h" #include "e-calendar-view.h" #include "e-cell-date-edit-text.h" #include "print.h" -#include <e-util/e-util-private.h> -#include <e-util/e-icon-factory.h> #include "misc.h" #define E_TASK_TABLE_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-task-table.h b/calendar/gui/e-task-table.h index cf215fd449..617679c76b 100644 --- a/calendar/gui/e-task-table.h +++ b/calendar/gui/e-task-table.h @@ -23,9 +23,8 @@ #ifndef E_TASK_TABLE_H #define E_TASK_TABLE_H -#include <table/e-table.h> -#include <table/e-cell-date-edit.h> #include <shell/e-shell-view.h> + #include "e-cal-model.h" /* diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 41b40dcf3b..9c9aeefacd 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -32,10 +32,12 @@ #include <config.h> #endif -#include <widgets/e-timezone-dialog/e-timezone-dialog.h> -#include <glib/gi18n.h> #include "e-timezone-entry.h" +#include <glib/gi18n.h> + +#include "e-util/e-util.h" + #define E_TIMEZONE_ENTRY_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryPrivate)) diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 1aa507deb4..298319cdea 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -30,15 +30,13 @@ #include <config.h> #endif -#include "e-util/e-categories-config.h" #include "e-week-view-event-item.h" #include <gtk/gtk.h> + #include "e-calendar-view.h" #include "comp-util.h" -#include <text/e-text.h> - #define E_WEEK_VIEW_EVENT_ITEM_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_WEEK_VIEW_EVENT_ITEM, EWeekViewEventItemPrivate)) diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 9a3e92de24..2e00d3b078 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -30,36 +30,31 @@ #endif #include "e-week-view.h" -#include "ea-calendar.h" #include <math.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <libgnomecanvas/libgnomecanvas.h> -#include <text/e-text.h> -#include <misc/e-canvas-utils.h> -#include <e-util/e-unicode.h> -#include <e-util/e-categories-config.h> -#include <e-util/e-dialog-utils.h> -#include <e-util/e-util.h> + #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" #include "dialogs/send-comp.h" #include "dialogs/cancel-comp.h" #include "dialogs/recur-comp.h" #include "dialogs/goto-dialog.h" + #include "calendar-config.h" -#include "comp-util.h" -#include "itip-utils.h" #include "calendar-config.h" -#include "print.h" +#include "comp-util.h" #include "e-cal-model-calendar.h" #include "e-week-view-event-item.h" #include "e-week-view-layout.h" #include "e-week-view-main-item.h" #include "e-week-view-titles-item.h" +#include "ea-calendar.h" +#include "itip-utils.h" #include "misc.h" -#include <e-util/e-icon-factory.h> +#include "print.h" /* Images */ #include "art/jump.xpm" diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c index 35c3819062..fe1f731bfe 100644 --- a/calendar/gui/ea-cal-view-event.c +++ b/calendar/gui/ea-cal-view-event.c @@ -24,12 +24,12 @@ #include <config.h> #endif +#include <glib/gi18n.h> + #include "ea-cal-view-event.h" #include "ea-calendar-helpers.h" #include "ea-day-view.h" #include "ea-week-view.h" -#include <text/e-text.h> -#include <glib/gi18n.h> static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); static void ea_cal_view_event_init (EaCalViewEvent *a11y); diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c index e0234d0a08..8d907f5bbf 100644 --- a/calendar/gui/ea-calendar-helpers.c +++ b/calendar/gui/ea-calendar-helpers.c @@ -31,7 +31,6 @@ #include "e-day-view.h" #include "e-week-view.h" -#include <text/e-text.h> #include <libgnomecanvas/libgnomecanvas.h> /** diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c index 2aa7daac88..4fe44ae7b7 100644 --- a/calendar/gui/ea-calendar.c +++ b/calendar/gui/ea-calendar.c @@ -24,10 +24,9 @@ #include <config.h> #endif -#include <text/e-text.h> #include <libgnomecanvas/libgnomecanvas.h> + #include "ea-calendar-helpers.h" -#include "a11y/ea-factory.h" #include "ea-calendar.h" #include "calendar/gui/ea-cal-view.h" diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c index 5e25a2aae1..c72b21ea0b 100644 --- a/calendar/gui/ea-day-view-cell.c +++ b/calendar/gui/ea-day-view-cell.c @@ -28,7 +28,6 @@ #include "ea-day-view-cell.h" #include "ea-day-view-main-item.h" #include "ea-day-view.h" -#include "a11y/ea-factory.h" /* EDayViewCell */ diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c index 3367833a4f..e8f81ff67f 100644 --- a/calendar/gui/ea-day-view-main-item.c +++ b/calendar/gui/ea-day-view-main-item.c @@ -25,12 +25,12 @@ #include <config.h> #endif +#include <glib/gi18n.h> + #include "ea-day-view-main-item.h" #include "e-day-view-top-item.h" #include "ea-day-view.h" #include "ea-day-view-cell.h" -#include "ea-cell-table.h" -#include <glib/gi18n.h> /* EaDayViewMainItem */ static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c index 2ceb8e17bc..d888b47774 100644 --- a/calendar/gui/ea-week-view-cell.c +++ b/calendar/gui/ea-week-view-cell.c @@ -28,7 +28,6 @@ #include "ea-week-view-cell.h" #include "ea-week-view-main-item.h" -#include "a11y/ea-factory.h" /* EWeekViewCell */ diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c index d4597d8fdd..816660cb3f 100644 --- a/calendar/gui/ea-week-view-main-item.c +++ b/calendar/gui/ea-week-view-main-item.c @@ -26,10 +26,11 @@ #endif #include "ea-week-view-main-item.h" + +#include <glib/gi18n.h> + #include "ea-week-view.h" #include "ea-week-view-cell.h" -#include "ea-cell-table.h" -#include <glib/gi18n.h> /* EaWeekViewMainItem */ static void ea_week_view_main_item_class_init diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c index 26cdcf2eed..24d6e8de83 100644 --- a/calendar/gui/ea-week-view.c +++ b/calendar/gui/ea-week-view.c @@ -25,11 +25,12 @@ #endif #include "ea-week-view.h" + +#include <glib/gi18n.h> + #include "ea-cal-view-event.h" #include "ea-calendar-helpers.h" #include "ea-gnome-calendar.h" -#include <text/e-text.h> -#include <glib/gi18n.h> static void ea_week_view_class_init (EaWeekViewClass *klass); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 0ea1008701..8b9b2b3c17 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -29,38 +29,36 @@ #include <config.h> #endif +#include "gnome-cal.h" + #include <unistd.h> #include <math.h> #include <signal.h> #include <fcntl.h> -#include <gdk/gdkkeysyms.h> + #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> -#include <widgets/menus/gal-view-factory-etable.h> -#include <widgets/menus/gal-view-etable.h> -#include <widgets/menus/gal-define-views-dialog.h> -#include "e-util/e-util.h" -#include "libevolution-utils/e-alert-dialog.h" -#include "e-util/e-util-private.h" #include "shell/e-shell.h" + #include "dialogs/delete-error.h" #include "dialogs/event-editor.h" + +#include "calendar-config.h" +#include "calendar-view-factory.h" +#include "calendar-view.h" #include "comp-util.h" +#include "e-cal-list-view.h" #include "e-cal-model-calendar.h" -#include "e-day-view.h" #include "e-day-view-time-item.h" +#include "e-day-view.h" +#include "e-memo-table.h" #include "e-month-view.h" +#include "e-task-table.h" #include "e-week-view.h" -#include "e-cal-list-view.h" -#include "gnome-cal.h" -#include "calendar-config.h" -#include "calendar-view.h" -#include "calendar-view-factory.h" -#include "tag-calendar.h" -#include "misc.h" #include "ea-calendar.h" -#include "e-memo-table.h" -#include "e-task-table.h" +#include "misc.h" +#include "tag-calendar.h" #define d(x) diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index c2f491b1bd..dcb801754f 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -31,7 +31,7 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <misc/e-calendar.h> +#include <e-util/e-util.h> #include "e-cal-model.h" diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 1af60b8192..f758574c59 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -29,8 +29,6 @@ #include <libical/ical.h> #include <libsoup/soup.h> -#include <e-util/e-dialog-utils.h> - #include <composer/e-msg-composer.h> #include "itip-utils.h" diff --git a/calendar/gui/print.c b/calendar/gui/print.c index b4e6ff2133..c9e48a520c 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -28,16 +28,17 @@ #include <config.h> #endif +#include "print.h" + #include <sys/stat.h> #include <sys/time.h> #include <math.h> #include <string.h> #include <time.h> + #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <e-util/e-util.h> -#include <e-util/e-print.h> #include "e-cal-model.h" #include "e-day-view.h" #include "e-day-view-layout.h" @@ -45,7 +46,6 @@ #include "e-week-view-layout.h" #include "e-task-table.h" #include "gnome-cal.h" -#include "print.h" #include "art/jump.xpm" diff --git a/calendar/gui/print.h b/calendar/gui/print.h index b81bcfa36c..1b7d31194b 100644 --- a/calendar/gui/print.h +++ b/calendar/gui/print.h @@ -25,7 +25,8 @@ #ifndef PRINT_H #define PRINT_H -#include <table/e-table.h> +#include <e-util/e-util.h> + #include "calendar/gui/gnome-cal.h" typedef enum { diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h index aa3eb2a8a4..b9f406e61f 100644 --- a/calendar/gui/tag-calendar.h +++ b/calendar/gui/tag-calendar.h @@ -28,7 +28,7 @@ #define TAG_CALENDAR_H #include <libecal/libecal.h> -#include <misc/e-calendar.h> +#include <e-util/e-util.h> void tag_calendar_by_client (ECalendar *ecal, ECalClient *client, GCancellable *cancellable); void tag_calendar_by_comp (ECalendar *ecal, ECalComponent *comp, diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 7480358f27..f9e984634d 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -6,10 +6,10 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ - -I$(top_srcdir)/widgets \ -I$(top_builddir)/calendar \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libevolution_calendar_importers_la_SOURCES = \ @@ -21,9 +21,9 @@ libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libevolution_calendar_importers_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 89e5f0ccfc..d54a8876c5 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -36,17 +36,12 @@ #include <gtk/gtk.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <libical/icalvcal.h> -#include "evolution-calendar-importer.h" #include "shell/e-shell.h" -#include "gui/calendar-config-keys.h" -#include "e-util/e-import.h" -#include "e-util/e-util-private.h" -#include "e-util/e-datetime-format.h" -#include "misc/e-web-view-preview.h" +#include "evolution-calendar-importer.h" +#include "gui/calendar-config-keys.h" /* We timeout after 2 minutes, when opening the folders. */ #define IMPORTER_TIMEOUT_SECONDS 120 |