diff options
Diffstat (limited to 'calendar/gui')
81 files changed, 95 insertions, 214 deletions
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 6b7f5b11e2..50b370fd0f 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -33,8 +33,6 @@ #include <string.h> #include <gio/gio.h> #include <e-util/e-util.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> #include <widgets/e-timezone-dialog/e-timezone-dialog.h> #include <shell/e-shell.h> diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index 81f8534364..c005ec399e 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -30,7 +30,8 @@ #include <gio/gio.h> #include <gdk/gdk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include <e-util/e-util-enums.h> /* These are used to get/set the working days in the week. The bit-flags are diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index f768335c3c..82f92e055a 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -28,11 +28,11 @@ #include <string.h> #include <time.h> +#include <libedataserverui/libedataserverui.h> + #include "calendar-config.h" #include "comp-util.h" #include "dialogs/delete-comp.h" -#include <libecal/e-cal-component.h> -#include <libedataserverui/e-client-utils.h> #include "e-util/e-categories-config.h" #include "gnome-cal.h" diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index 12508da42e..ff7a1351d3 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -26,8 +26,8 @@ #define COMP_UTIL_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include <e-util/e-util-enums.h> struct _EShell; diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index c8670d2500..d6fb07e91a 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -31,14 +31,12 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-time-util.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 <libebook/e-destination.h> -#include <libedataserverui/e-name-selector.h> #include <libical/icalattach.h> #include "../calendar-config.h" #include "comp-editor-util.h" diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h index 6e6d65827c..79c85bf18b 100644 --- a/calendar/gui/dialogs/alarm-dialog.h +++ b/calendar/gui/dialogs/alarm-dialog.h @@ -30,9 +30,7 @@ #ifndef ALARM_DIALOG_H #define ALARM_DIALOG_H -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> G_BEGIN_DECLS diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 5c318c0a90..78c53a32a6 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -33,9 +33,7 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-time-util.h> + #include "e-util/e-util.h" #include "e-util/e-util-private.h" #include "alarm-dialog.h" diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h index 1717d12f22..289d887b92 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.h +++ b/calendar/gui/dialogs/alarm-list-dialog.h @@ -30,9 +30,8 @@ #ifndef ALARM_LIST_DIALOG_H #define ALARM_LIST_DIALOG_H -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> + #include "../e-alarm-list.h" G_BEGIN_DECLS diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h index 3514cf19f5..bfc1c6cbc4 100644 --- a/calendar/gui/dialogs/cancel-comp.h +++ b/calendar/gui/dialogs/cancel-comp.h @@ -26,8 +26,7 @@ #ifndef CANCEL_COMP_H #define CANCEL_COMP_H -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> gboolean cancel_component_dialog (GtkWindow *parent, ECalClient *cal_client, ECalComponent *comp, gboolean deleting); diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h index 6bb20210dd..88905a2581 100644 --- a/calendar/gui/dialogs/changed-comp.h +++ b/calendar/gui/dialogs/changed-comp.h @@ -24,7 +24,7 @@ #define CHANGED_COMP_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> gboolean changed_component_dialog (GtkWindow *window, ECalComponent *comp, gboolean deleted, gboolean changed); diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index f8ab87de63..a13e7ff549 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -27,8 +27,7 @@ #include <time.h> #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> #include <calendar/gui/e-meeting-attendee.h> diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 58c649b7ee..5938f52e14 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -30,8 +30,7 @@ #include <string.h> #include <libical/ical.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libecal/e-cal-time-util.h> + #include "widgets/misc/e-dateedit.h" #include "../itip-utils.h" #include <shell/e-shell.h> diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 5e447e76c4..027146753c 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -36,17 +36,14 @@ #include <glib/gstdio.h> #include <gio/gio.h> #include <gdk/gdkkeysyms.h> -#include <libebackend/e-extensible.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 <libedataserver/e-data-server-util.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-client-view.h> - #include "../print.h" #include "../comp-util.h" #include "save-comp.h" diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index c2a3082a31..14fbc0ff5b 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -26,7 +26,8 @@ #define COMP_EDITOR_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include "../itip-utils.h" #include "comp-editor-page.h" #include <shell/e-shell.h> diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 21b86087fb..5a7889e138 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -27,7 +27,7 @@ #endif #include <glib/gi18n.h> -#include <libedataserverui/e-client-utils.h> +#include <libedataserverui/libedataserverui.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 01124d4a76..eccd0b5763 100644 --- a/calendar/gui/dialogs/copy-source-dialog.h +++ b/calendar/gui/dialogs/copy-source-dialog.h @@ -27,9 +27,7 @@ #define COPY_SOURCE_DIALOG_H #include <gtk/gtk.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> void copy_source_dialog (GtkWindow *parent, ESourceRegistry *registry, diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h index 9123dcc479..c6fa3996fd 100644 --- a/calendar/gui/dialogs/delete-comp.h +++ b/calendar/gui/dialogs/delete-comp.h @@ -27,7 +27,7 @@ #define DELETE_COMP_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> gboolean delete_component_dialog (ECalComponent *comp, gboolean consider_as_untitled, diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h index 91e38c146f..9aa3ff8376 100644 --- a/calendar/gui/dialogs/delete-error.h +++ b/calendar/gui/dialogs/delete-error.h @@ -26,8 +26,7 @@ #ifndef DELETE_ERROR_H #define DELETE_ERROR_H -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> void delete_error_dialog (const GError *error, ECalComponentVType vtype); diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index ca253ca430..a7016a4cdd 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -28,8 +28,9 @@ #include <gtk/gtk.h> #include <libical/ical.h> -#include <libebook/e-destination.h> -#include <libedataserverui/e-name-selector.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> + #include "e-util/e-util.h" #include "e-util/e-util-private.h" #include "e-delegate-dialog.h" diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index 85a0613532..245e1fed2e 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -25,7 +25,7 @@ #define E_DELEGATE_DIALOG_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_DELEGATE_DIALOG \ diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index d438f16473..6f3d4034ab 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -31,8 +31,6 @@ #include <stdlib.h> #include <string.h> -#include <libedataserver/e-source-extension.h> - void e_send_options_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index 3ec75426e4..f5c3f0a408 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -25,9 +25,9 @@ #ifndef __E_SENDOPTIONS_UTILS_H__ #define __E_SENDOPTIONS_UTILS_H__ +#include <libecal/libecal.h> + #include "misc/e-send-options.h" -#include <libecal/e-cal-component.h> -#include <libedataserver/e-source.h> void e_send_options_utils_set_default_data (ESendOptionsDialog *sod, diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 44e36c6e58..437af2da8e 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -35,12 +35,7 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-category-completion.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-util.h> #include <e-util/e-categories-config.h> diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 4e054d2a5b..d4659a73bb 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -34,14 +34,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-category-completion.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> -#include <libedataserverui/e-name-selector.h> -#include <libedataserverui/e-name-selector-entry.h> -#include <libedataserverui/e-name-selector-list.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-util.h> #include <e-util/e-categories-config.h> diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h index 7087daa166..69b0ec8bd5 100644 --- a/calendar/gui/dialogs/recur-comp.h +++ b/calendar/gui/dialogs/recur-comp.h @@ -26,9 +26,7 @@ #define RECUR_COMP_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-util.h> +#include <libecal/libecal.h> gboolean recur_component_dialog (ECalClient *client, ECalComponent *comp, diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 56601cee74..e5e3144fdd 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -32,10 +32,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> + #include <misc/e-dateedit.h> -#include <libecal/e-cal-recur.h> -#include <libecal/e-cal-time-util.h> #include "../tag-calendar.h" #include "../weekday-picker.h" #include "comp-editor-util.h" diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h index 5105e4af7f..59808b3a75 100644 --- a/calendar/gui/dialogs/save-comp.h +++ b/calendar/gui/dialogs/save-comp.h @@ -27,7 +27,7 @@ #define SAVE_COMP_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> GtkResponseType save_component_dialog (GtkWindow *parent, ECalComponent *comp); diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index 59b97c754f..1c554364fa 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -28,7 +28,7 @@ #include "../e-meeting-store.h" #include "comp-editor.h" #include "comp-editor-page.h" -#include <libedataserverui/e-name-selector.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 8ea35e2c00..9f80038e8b 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -26,8 +26,8 @@ #endif #include <glib/gi18n.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-source-selector-dialog.h> +#include <libedataserverui/libedataserverui.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 77864e8c97..de67fef7fd 100644 --- a/calendar/gui/dialogs/select-source-dialog.h +++ b/calendar/gui/dialogs/select-source-dialog.h @@ -27,8 +27,7 @@ #define SELECT_SOURCE_DIALOG_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> ESource * select_source_dialog (GtkWindow *parent, ESourceRegistry *registry, diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h index 91584a7f4b..154f5233e4 100644 --- a/calendar/gui/dialogs/send-comp.h +++ b/calendar/gui/dialogs/send-comp.h @@ -25,8 +25,7 @@ #define SEND_COMP_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> gboolean send_component_dialog (GtkWindow *parent, ECalClient *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms, gboolean *only_new_attendees); gboolean send_component_prompt_subject (GtkWindow *parent, ECalClient *client, ECalComponent *comp); diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 665e03eb30..297e1f4313 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -34,11 +34,7 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-category-completion.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> +#include <libedataserverui/libedataserverui.h> #include <misc/e-dateedit.h> #include <misc/e-spell-entry.h> diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 67511165cf..e03a9f2528 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -28,8 +28,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-time-utils.h> + #include "calendar-config.h" #include "e-alarm-list.h" diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h index e65e7514c1..f3807a8b0d 100644 --- a/calendar/gui/e-alarm-list.h +++ b/calendar/gui/e-alarm-list.h @@ -27,7 +27,7 @@ #define E_ALARM_LIST_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index a1bfe92850..0cd65b0cd1 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -32,9 +32,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <camel/camel.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-time-utils.h> + #include <e-util/e-util.h> #include <e-util/e-categories-config.h> diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 091f66c252..5048e3ab07 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -25,7 +25,7 @@ #define E_CAL_COMPONENT_PREVIEW_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> #include <misc/e-web-view.h> /* Standard GObject macros */ diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index f03220ffb8..5cadd428a1 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -24,7 +24,8 @@ #ifndef E_CAL_CONFIG_H #define E_CAL_CONFIG_H -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include "e-util/e-config.h" /* Standard GObject macros */ diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 48458e6123..62e02b96ae 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -45,7 +45,6 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-util-private.h> -#include <libecal/e-cal-time-util.h> #include "e-cal-model-calendar.h" #include "e-cell-date-edit-text.h" #include "dialogs/delete-comp.h" diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index ca87150a7e..565f629b2c 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -30,7 +30,6 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> #include "calendar-config.h" #include "e-cal-model-tasks.h" diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 9536a40064..2aaefc363d 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -29,12 +29,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-flag.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-source-calendar.h> -#include <libecal/e-cal-client-view.h> -#include <libecal/e-cal-time-util.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <e-util/e-util-enumtypes.h> diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index 68a6235d0b..7f19e00c16 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -26,10 +26,10 @@ #ifndef E_CAL_MODEL_H #define E_CAL_MODEL_H +#include <libecal/libecal.h> + #include <e-util/e-util-enums.h> #include <table/e-table-model.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> #include "e-cell-date-edit-text.h" /* Standard GObject macros */ diff --git a/calendar/gui/e-cal-source-config.c b/calendar/gui/e-cal-source-config.c index 4b462a7960..1d3243c77b 100644 --- a/calendar/gui/e-cal-source-config.c +++ b/calendar/gui/e-cal-source-config.c @@ -21,9 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-offline.h> - #include <e-util/e-util.h> #define E_CAL_SOURCE_CONFIG_GET_PRIVATE(obj) \ diff --git a/calendar/gui/e-cal-source-config.h b/calendar/gui/e-cal-source-config.h index 924958e00c..4db861069e 100644 --- a/calendar/gui/e-cal-source-config.h +++ b/calendar/gui/e-cal-source-config.h @@ -19,9 +19,8 @@ #ifndef E_CAL_SOURCE_CONFIG_H #define E_CAL_SOURCE_CONFIG_H -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> #include <misc/e-source-config.h> -#include <libedataserver/e-source-extension.h> /* Standard GObject macros */ #define E_TYPE_CAL_SOURCE_CONFIG \ diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c index 92f0ffdb34..6c403e43a2 100644 --- a/calendar/gui/e-calendar-selector.c +++ b/calendar/gui/e-calendar-selector.c @@ -22,9 +22,7 @@ #include "e-calendar-selector.h" -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> #include "e-util/e-selection.h" diff --git a/calendar/gui/e-calendar-selector.h b/calendar/gui/e-calendar-selector.h index d8aec73d2a..1e7128bbda 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/e-source-selector.h> +#include <libedataserverui/libedataserverui.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 3ad69e300a..7bab36838f 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -30,17 +30,15 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserverui/e-client-utils.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 <libecal/e-cal-time-util.h> -#include <libecal/e-cal-component.h> #include <misc/e-selectable.h> #include <shell/e-shell.h> diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 40799fe105..219305dceb 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -24,7 +24,8 @@ #define E_CALENDAR_VIEW_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include "e-cal-model.h" #include "gnome-cal.h" #include "dialogs/comp-editor.h" diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index 594bcf07c8..034d715d9b 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -30,11 +30,10 @@ #include <unistd.h> #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> +#include <libecal/libecal.h> + #include <e-util/e-util.h> #include <e-util/e-datetime-format.h> -#include <libecal/e-cal-time-util.h> #include "e-cell-date-edit-text.h" diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index 1342c0e5d7..70a4578f70 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -26,10 +26,10 @@ #include <config.h> #endif -#include <string.h> -#include <libedataserver/e-time-utils.h> #include "e-date-time-list.h" -#include <libecal/e-cal-time-util.h> + +#include <string.h> +#include <libecal/libecal.h> /* XXX Was it really necessary to implement a custom GtkTreeModel for a * one-column list store? There's no mention of why this was done. */ diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h index e0bbf1ed88..9127d1d201 100644 --- a/calendar/gui/e-date-time-list.h +++ b/calendar/gui/e-date-time-list.h @@ -27,7 +27,7 @@ #define E_DATE_TIME_LIST_H #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> /* Standard GObject macros */ #define E_TYPE_DATE_TIME_LIST \ diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 4a7fb88bb6..cb20ffeb4e 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -29,7 +29,6 @@ #include <config.h> #endif -#include <libecal/e-cal-time-util.h> #include <e-calendar-view.h> #include "e-util/e-categories-config.h" diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index f270fcca63..3ddc9489d1 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -28,11 +28,10 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> + #include "e-day-view-time-item.h" #include "calendar-config.h" -#include <libecal/e-cal-time-util.h> #include <widgets/e-timezone-dialog/e-timezone-dialog.h> -#include <libedataserver/e-data-server-util.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 17a08a06ef..b5afbdf4e4 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -30,9 +30,7 @@ #include <glib/gi18n.h> #include "e-util/e-categories-config.h" -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-categories.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 0ea4e77845..4d15f03939 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -41,8 +41,6 @@ #include <e-util/e-dialog-utils.h> #include <e-util/e-selection.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" #include "dialogs/send-comp.h" diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index 7545a0f52d..27e3f3518b 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -25,7 +25,8 @@ #define _E_MEETING_ATTENDEE_H_ #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> + #include "e-meeting-types.h" G_BEGIN_DECLS diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 6368063fac..0c16a6fd95 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -28,16 +28,13 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> -#include <libebook/e-vcard.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserverui/e-name-selector.h> +#include <libecal/libecal.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> + #include "calendar-config.h" #include "e-meeting-list-view.h" #include "itip-utils.h" -#include <libebook/e-destination.h> #include <shell/e-shell.h> #include "e-select-names-renderer.h" diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index 6a2dc55523..d62cb05636 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -25,8 +25,9 @@ #define _E_MEETING_LIST_VIEW_H_ #include <gtk/gtk.h> +#include <libedataserverui/libedataserverui.h> + #include "e-meeting-store.h" -#include <libedataserverui/e-name-selector.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 3b2590cad6..6e73107b6f 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -29,15 +29,9 @@ #include <glib/gi18n.h> #include <libsoup/soup.h> -#include <libecal/e-cal-component.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-time-util.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-proxy.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-passwords.h> +#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 ec98bae554..f762cbc7a5 100644 --- a/calendar/gui/e-meeting-store.h +++ b/calendar/gui/e-meeting-store.h @@ -24,7 +24,8 @@ #define E_MEETING_STORE_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> + #include <e-util/e-util-enums.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 7e9c59c895..a7a5294241 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -33,7 +33,7 @@ #include <time.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <libgnomecanvas/libgnomecanvas.h> #include "misc/e-canvas.h" diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c index 119913cc3c..3e5623081a 100644 --- a/calendar/gui/e-memo-list-selector.c +++ b/calendar/gui/e-memo-list-selector.c @@ -24,9 +24,8 @@ #include "e-memo-list-selector.h" #include <string.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> + #include "e-util/e-selection.h" #include "calendar/gui/comp-util.h" diff --git a/calendar/gui/e-memo-list-selector.h b/calendar/gui/e-memo-list-selector.h index 62dc0e13cf..f131d661cc 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/e-source-selector.h> +#include <libedataserverui/libedataserverui.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 be2cd1a127..86f2c35a05 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -45,8 +45,6 @@ #include <e-util/e-util-private.h> #include <table/e-cell-date-edit.h> #include <table/e-cell-percent.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-time-utils.h> #include "dialogs/delete-comp.h" #include "dialogs/delete-error.h" diff --git a/calendar/gui/e-month-view.c b/calendar/gui/e-month-view.c index fe0bebaf8e..bfb3d1f2d6 100644 --- a/calendar/gui/e-month-view.c +++ b/calendar/gui/e-month-view.c @@ -25,8 +25,6 @@ #include "e-month-view.h" -#include <libecal/e-cal-time-util.h> - #define E_MONTH_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MONTH_VIEW, EMonthViewPrivate)) diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index 70e1de24e2..ae12fdc43f 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -26,8 +26,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <libebook/e-destination.h> -#include <libedataserverui/e-name-selector-entry.h> +#include <libebook/libebook.h> #include "e-select-names-editable.h" diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h index 58b0ce3290..f168902db9 100644 --- a/calendar/gui/e-select-names-editable.h +++ b/calendar/gui/e-select-names-editable.h @@ -24,7 +24,7 @@ #ifndef __E_SELECT_NAMES_EDITABLE_H__ #define __E_SELECT_NAMES_EDITABLE_H__ -#include <libedataserverui/e-name-selector-entry.h> +#include <libedataserverui/libedataserverui.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index 0adae5b031..1b8bbbae48 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -23,9 +23,8 @@ #include "e-task-list-selector.h" #include <string.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> + #include "e-util/e-selection.h" #include "calendar/gui/comp-util.h" diff --git a/calendar/gui/e-task-list-selector.h b/calendar/gui/e-task-list-selector.h index 735611acfc..fd133d1c10 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/e-source-selector.h> +#include <libedataserverui/libedataserverui.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 6a13e4e5e4..f21d617c7f 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -47,8 +47,6 @@ #include <table/e-cell-date-edit.h> #include <table/e-cell-percent.h> #include <table/e-table-sorting-utils.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-time-utils.h> #include "calendar-config.h" #include "dialogs/delete-comp.h" diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h index 59d2c00cb1..ad95adab1a 100644 --- a/calendar/gui/e-timezone-entry.h +++ b/calendar/gui/e-timezone-entry.h @@ -33,7 +33,7 @@ #define E_TIMEZONE_ENTRY_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> /* Standard GObject macros */ #define E_TYPE_TIMEZONE_ENTRY \ diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 133ad48f86..ae9ca7a75e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -51,7 +51,6 @@ #include "calendar-config.h" #include "comp-util.h" #include "itip-utils.h" -#include <libecal/e-cal-time-util.h> #include "calendar-config.h" #include "print.h" #include "e-cal-model-calendar.h" diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c index b989506e9e..3c7ef014b7 100644 --- a/calendar/gui/ea-gnome-calendar.c +++ b/calendar/gui/ea-gnome-calendar.c @@ -29,8 +29,6 @@ #include "e-calendar-view.h" #include <string.h> #include <gtk/gtk.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> #include <glib/gi18n.h> static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index f482e06039..7b737b69c0 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -35,12 +35,7 @@ #include <fcntl.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-url.h> -#include <libedataserverui/e-client-utils.h> -#include <libecal/e-cal-client-view.h> -#include <libecal/e-cal-time-util.h> #include <widgets/menus/gal-view-factory-etable.h> #include <widgets/menus/gal-view-etable.h> #include <widgets/menus/gal-define-views-dialog.h> diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index c8cb5e8f60..c2f491b1bd 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -29,9 +29,9 @@ #include <time.h> #include <gtk/gtk.h> +#include <libecal/libecal.h> + #include <misc/e-calendar.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> #include "e-cal-model.h" diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 2a676cdc23..12fac84185 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -29,13 +29,6 @@ #include <libical/ical.h> #include <libsoup/soup.h> -#include <libecal/e-cal-time-util.h> -#include <libecal/e-cal-util.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-registry.h> - #include <e-util/e-dialog-utils.h> #include <composer/e-msg-composer.h> diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h index 6408631dfa..18d2dcaa37 100644 --- a/calendar/gui/itip-utils.h +++ b/calendar/gui/itip-utils.h @@ -22,9 +22,7 @@ #include <libical/ical.h> #include <string.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> G_BEGIN_DECLS diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index a3243afa43..d02a9f618c 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -28,7 +28,6 @@ #include <ctype.h> #include <time.h> -#include <libedataserver/e-url.h> #include <glib/gi18n.h> #include "misc.h" @@ -64,25 +63,6 @@ string_is_empty (const gchar *value) } -/** - * get_uri_without_password - */ -gchar * -get_uri_without_password (const gchar *full_uri) -{ - EUri *uri; - gchar *uristr; - - uri = e_uri_new (full_uri); - if (!uri) - return NULL; - - uristr = e_uri_to_string (uri, FALSE); - e_uri_free (uri); - - return uristr; - } - gint get_position_in_array (GPtrArray *objects, gpointer item) diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h index 6d3133b58d..f0727e73ab 100644 --- a/calendar/gui/misc.h +++ b/calendar/gui/misc.h @@ -30,7 +30,6 @@ #include <time.h> gboolean string_is_empty (const gchar *value); -gchar *get_uri_without_password (const gchar *uri); gint get_position_in_array (GPtrArray *objects, gpointer item); gchar * calculate_time (time_t start, time_t end); #endif diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 80bd508df0..a81b709f7e 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -35,12 +35,9 @@ #include <time.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> + #include <e-util/e-util.h> #include <e-util/e-print.h> -#include <libecal/e-cal-time-util.h> -#include <libecal/e-cal-component.h> #include "e-cal-model.h" #include "e-day-view.h" #include "e-day-view-layout.h" diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c index 2e1e511340..f681641f91 100644 --- a/calendar/gui/tag-calendar.c +++ b/calendar/gui/tag-calendar.c @@ -28,7 +28,6 @@ #include <config.h> #endif -#include <libecal/e-cal-time-util.h> #include "shell/e-shell.h" #include "shell/e-shell-settings.h" #include "calendar-config.h" diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h index c01e379b6e..aa3eb2a8a4 100644 --- a/calendar/gui/tag-calendar.h +++ b/calendar/gui/tag-calendar.h @@ -27,8 +27,8 @@ #ifndef TAG_CALENDAR_H #define TAG_CALENDAR_H +#include <libecal/libecal.h> #include <misc/e-calendar.h> -#include <libecal/e-cal-client.h> void tag_calendar_by_client (ECalendar *ecal, ECalClient *client, GCancellable *cancellable); void tag_calendar_by_comp (ECalendar *ecal, ECalComponent *comp, |