Adapt to single-include E-D-S libraries.

28 files changed, 36 insertions, 74 deletions

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>