diff options
371 files changed, 389 insertions, 962 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 8fb7acfa1e..51a9e28db9 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -24,7 +24,7 @@ #define __E_CONTACT_EDITOR_FULLNAME_H__ #include <gtk/gtk.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> G_BEGIN_DECLS diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 131ca474c7..e03d00cffd 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -35,11 +35,7 @@ #include <gdk/gdkkeysyms.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <libebook/e-address-western.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-categories-dialog.h> -#include <libedataserverui/e-category-completion.h> -#include <libedataserverui/e-source-combo-box.h> +#include <libedataserverui/libedataserverui.h> #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 7f39fe421e..49446f7350 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -25,9 +25,6 @@ #include "addressbook/gui/contact-editor/eab-editor.h" -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> - #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 7172a6022c..5ea618bc32 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -28,11 +28,9 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> -#include <libedataserver/e-source-address-book.h> + +#include <libedataserverui/libedataserverui.h> + #include <addressbook/util/eab-book-util.h> #include "e-contact-editor.h" #include "e-contact-quick-add.h" diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h index 91e64014e7..cd5d8ba44c 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.h +++ b/addressbook/gui/contact-editor/e-contact-quick-add.h @@ -23,8 +23,7 @@ #ifndef __E_CONTACT_QUICK_ADD_H__ #define __E_CONTACT_QUICK_ADD_H__ -#include <libebook/e-contact.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> typedef void (*EContactQuickAddCallback) (EContact *new_contact, gpointer closure); diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index cf8a20aecb..88ede1522f 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -25,7 +25,7 @@ #define __EAB_EDITOR_H__ #include <gtk/gtk.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <shell/e-shell.h> /* Standard GObject macros */ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index f67eecb979..fe61ccaa9e 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -37,8 +37,6 @@ #include <gdk/gdkkeysyms.h> #include <camel/camel.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> #include "e-util/e-util.h" #include "addressbook/gui/widgets/eab-gui-util.h" diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index ecf5098fa8..07cc4db6bf 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -23,14 +23,10 @@ #ifndef __E_CONTACT_LIST_EDITOR_H__ #define __E_CONTACT_LIST_EDITOR_H__ -#include <libedataserverui/e-name-selector.h> +#include <libedataserverui/libedataserverui.h> #include "addressbook/gui/contact-editor/eab-editor.h" -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> -#include <libebook/e-destination.h> - #define E_TYPE_CONTACT_LIST_EDITOR \ (e_contact_list_editor_get_type ()) #define E_CONTACT_LIST_EDITOR(obj) \ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h index 91e8a82cdb..ad10d7d539 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h @@ -21,8 +21,7 @@ #define _E_CONTACT_LIST_MODEL_H_ #include <gtk/gtk.h> -#include <libebook/e-contact.h> -#include <libebook/e-destination.h> +#include <libebook/libebook.h> /* Standard GObject macros */ #define E_TYPE_CONTACT_LIST_MODEL \ diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 872648ca42..9a55ffb134 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -27,9 +27,9 @@ #include <ctype.h> #include <string.h> -#include <libebook/e-book-query.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-client-utils.h> + +#include <libedataserverui/libedataserverui.h> + #include "addressbook/util/eab-book-util.h" #include "eab-contact-compare.h" diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h index 30c1c2d0cf..f6b05705cf 100644 --- a/addressbook/gui/merging/eab-contact-compare.h +++ b/addressbook/gui/merging/eab-contact-compare.h @@ -26,9 +26,7 @@ #ifndef __EAB_CONTACT_COMPARE_H__ #define __EAB_CONTACT_COMPARE_H__ -#include <libebook/e-contact.h> -#include <libebook/e-book-client.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> typedef enum { EAB_CONTACT_MATCH_NOT_APPLICABLE = 0, diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h index a4f62e80c0..fbdc9b0889 100644 --- a/addressbook/gui/merging/eab-contact-merging.h +++ b/addressbook/gui/merging/eab-contact-merging.h @@ -26,8 +26,7 @@ #ifndef __E_CONTACT_MERGING_H__ #define __E_CONTACT_MERGING_H__ -#include <libebook/e-book-client.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 24c4302457..c5b6489434 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -21,10 +21,7 @@ #ifndef E_ADDRESSBOOK_MODEL_H #define E_ADDRESSBOOK_MODEL_H -#include <libebook/e-book-client.h> -#include <libebook/e-book-client-view.h> -#include <libebook/e-book-query.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> /* Standard GObject macros */ #define E_TYPE_ADDRESSBOOK_MODEL \ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index bc428ba30c..d65f3f39fd 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -21,8 +21,9 @@ #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ +#include <libebook/libebook.h> #include <text/e-reflow-model.h> -#include <libebook/e-contact.h> + #include "e-addressbook-model.h" #define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER (e_addressbook_reflow_adapter_get_type ()) diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 3370eaf629..80595ef59b 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -24,9 +24,6 @@ #include "e-addressbook-selector.h" -#include <libedataserverui/e-client-utils.h> -#include <libedataserver/e-source-address-book.h> - #include <e-util/e-selection.h> #include <eab-book-util.h> diff --git a/addressbook/gui/widgets/e-addressbook-selector.h b/addressbook/gui/widgets/e-addressbook-selector.h index d4d6ad8abd..adabea7205 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.h +++ b/addressbook/gui/widgets/e-addressbook-selector.h @@ -21,7 +21,8 @@ #ifndef E_ADDRESSBOOK_SELECTOR_H #define E_ADDRESSBOOK_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> + #include "e-addressbook-view.h" /* Standard GObject macros */ diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 165f1d7591..c6775d4e5a 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> +#include <libebook/libebook.h> #include "e-addressbook-model.h" #include "e-addressbook-table-adapter.h" diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 8dc7208fde..e7173bc256 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -41,8 +41,6 @@ #include "e-util/e-print.h" #include "e-util/e-selection.h" #include "e-util/e-util.h" -#include "libedataserver/e-sexp.h" -#include <libedataserver/e-categories.h> #include "gal-view-minicard.h" #include "gal-view-factory-minicard.h" diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 1ccfba99b3..3c8c5e2218 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -23,8 +23,7 @@ #ifndef E_ADDRESSBOOK_VIEW_H #define E_ADDRESSBOOK_VIEW_H -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <menus/gal-view-instance.h> #include <misc/e-selection-model.h> diff --git a/addressbook/gui/widgets/e-book-source-config.c b/addressbook/gui/widgets/e-book-source-config.c index 7c751030b5..6fca964b68 100644 --- a/addressbook/gui/widgets/e-book-source-config.c +++ b/addressbook/gui/widgets/e-book-source-config.c @@ -21,10 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> -#include <libedataserver/e-source-offline.h> - #define E_BOOK_SOURCE_CONFIG_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_BOOK_SOURCE_CONFIG, EBookSourceConfigPrivate)) diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index aea68bd5db..f540a43f8e 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -24,7 +24,8 @@ #define __E_MINICARD_VIEW_WIDGET_H__ #include <misc/e-canvas.h> -#include <libebook/e-book-client.h> +#include <libebook/libebook.h> + #include "e-minicard-view.h" G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index a07c5d90bf..502ab5f315 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -24,8 +24,6 @@ #include <config.h> #endif -#include <libebook/e-book-client.h> - #include "e-minicard-view.h" #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 86a17eca87..f7d0f7a053 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -38,7 +38,6 @@ #include "e-minicard-view.h" #include <e-util/e-html-utils.h> #include <e-util/e-icon-factory.h> -#include <libebook/e-destination.h> #include "ea-addressbook.h" static void e_minicard_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 7fa5519cbb..986f47194a 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -24,8 +24,8 @@ #define E_MINICARD_H #include <gtk/gtk.h> +#include <libebook/libebook.h> #include <libgnomecanvas/libgnomecanvas.h> -#include <libebook/e-contact.h> /* Standard GObject macros */ #define E_TYPE_MINICARD \ diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 36134c08e7..3907889415 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -24,7 +24,8 @@ #ifndef __EAB_CONFIG_H__ #define __EAB_CONFIG_H__ -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> + #include "e-util/e-config.h" #define EAB_TYPE_CONFIG (eab_config_get_type ()) diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index 610714800b..79243dedae 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -23,8 +23,8 @@ #ifndef EAB_CONTACT_DISPLAY_H #define EAB_CONTACT_DISPLAY_H -#include <libebook/e-contact.h> -#include <libebook/e-destination.h> +#include <libebook/libebook.h> + #include <misc/e-web-view.h> /* Standard GObject macros */ diff --git a/addressbook/gui/widgets/eab-contact-formatter.h b/addressbook/gui/widgets/eab-contact-formatter.h index 690d74321b..e1f706eb24 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.h +++ b/addressbook/gui/widgets/eab-contact-formatter.h @@ -17,10 +17,10 @@ #ifndef EAB_CONTACT_FORMATTER_H #define EAB_CONTACT_FORMATTER_H -#include <libebook/e-contact.h> -#include <addressbook/gui/widgets/eab-contact-display.h> - #include <camel/camel.h> +#include <libebook/libebook.h> + +#include <addressbook/gui/widgets/eab-contact-display.h> /* Standard GObject macros */ #define EAB_TYPE_CONTACT_FORMATTER \ diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 95b49a30f6..e0eed37cc3 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -34,11 +34,9 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libebook/e-destination.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> + +#include <libedataserverui/libedataserverui.h> + #include <e-util/e-util.h> #include "eab-gui-util.h" #include "util/eab-book-util.h" diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 3f6f31997b..7cdd93e84d 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -25,8 +25,8 @@ #define __E_ADDRESSBOOK_UTIL_H__ #include <gtk/gtk.h> -#include <libebook/e-book-client.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> + #include "libevolution-utils/e-alert-sink.h" G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index b74f4fb2fd..1016b2c610 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -29,7 +29,6 @@ #include <libxml/parser.h> #include <libevolution-utils/e-xml-utils.h> -#include <libedataserver/e-xml-utils.h> #include "gal-view-minicard.h" diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 1f4c4dc87f..9d693e1300 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -34,12 +34,8 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebook/e-book-client.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserver/e-source-address-book.h> - -#include <libebook/e-destination.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <e-util/e-import.h> diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index c6f70fbca2..bf1c15793c 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -41,12 +41,8 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebook/e-book-client.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserver/e-source-address-book.h> - -#include <libebook/e-destination.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <e-util/e-import.h> diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 5fb0aaa7e5..b20bdd18de 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -35,13 +35,10 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebook/e-book-client.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserver/e-source-address-book.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <util/eab-book-util.h> -#include <libebook/e-destination.h> #include <shell/e-shell.h> #include <e-util/e-import.h> diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 0746a431c5..72ee6886c8 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -32,12 +32,6 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-client-view.h> -#include <libebook/e-contact.h> - -#include <libedataserver/e-flag.h> -#include <libedataserver/e-xml-utils.h> #include "e-util/e-print.h" #include "e-util/e-util.h" diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h index 94a61b080c..6cdc231ddd 100644 --- a/addressbook/printing/e-contact-print.h +++ b/addressbook/printing/e-contact-print.h @@ -24,8 +24,8 @@ #define E_CONTACT_PRINT_H #include <gtk/gtk.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> +#include <libebook/libebook.h> + #include "e-contact-print-types.h" void e_contact_print (EBookClient *book_client, diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 25a89856f9..977fd9cac4 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -32,11 +32,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libebook/e-contact.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-address-book.h> +#include <libebook/libebook.h> #include "evolution-addressbook-export.h" diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index e64717273f..bfaf110cb9 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -27,10 +27,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-address-book.h> +#include <libebook/libebook.h> #include "evolution-addressbook-export.h" diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c index f5341a6fe7..47b2671d5a 100644 --- a/addressbook/tools/evolution-addressbook-export.c +++ b/addressbook/tools/evolution-addressbook-export.c @@ -28,7 +28,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> +#include <libebook/libebook.h> #include "evolution-addressbook-export.h" diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h index ec8df060fc..b059252f00 100644 --- a/addressbook/tools/evolution-addressbook-export.h +++ b/addressbook/tools/evolution-addressbook-export.h @@ -24,7 +24,7 @@ #ifndef _EVOLUTION_ADDRESSBOOK_EXPORT_H_ #define _EVOLUTION_ADDRESSBOOK_EXPORT_H__ -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> G_BEGIN_DECLS diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index b25bbce513..7104c445cb 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -26,7 +26,6 @@ #endif #include <string.h> -#include <libedataserver/e-source-registry.h> #include "eab-book-util.h" diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 99e92b95b5..f05c9a7bbd 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -24,8 +24,7 @@ #ifndef EAB_BOOK_UTIL_H #define EAB_BOOK_UTIL_H -#include <libebook/e-book-client.h> -#include <libedataserver/e-source-registry.h> +#include <libebook/libebook.h> G_BEGIN_DECLS diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index f4bc1f41c9..cf94366ae9 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -29,8 +29,7 @@ #include <stdio.h> #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libecal/e-cal-time-util.h> + #include "alarm-notify-dialog.h" #include "config-data.h" #include "util.h" diff --git a/calendar/alarm-notify/alarm-notify-dialog.h b/calendar/alarm-notify/alarm-notify-dialog.h index f61bdba9c8..68e322540a 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.h +++ b/calendar/alarm-notify/alarm-notify-dialog.h @@ -25,7 +25,7 @@ #include <time.h> #include <gtk/gtk.h> -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> typedef enum { ALARM_NOTIFY_CLOSE, diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c index 3af3a206a7..a41ba95923 100644 --- a/calendar/alarm-notify/alarm-notify.c +++ b/calendar/alarm-notify/alarm-notify.c @@ -26,13 +26,6 @@ #include <string.h> #include <camel/camel.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-alarms.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-client-utils.h> #include "alarm.h" #include "alarm-notify.h" diff --git a/calendar/alarm-notify/alarm-notify.h b/calendar/alarm-notify/alarm-notify.h index 1dc46eed80..61097f310a 100644 --- a/calendar/alarm-notify/alarm-notify.h +++ b/calendar/alarm-notify/alarm-notify.h @@ -27,8 +27,8 @@ #define ALARM_NOTIFY_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define TYPE_ALARM_NOTIFY \ diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index 7d3a082d5a..a3a5351acd 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -34,10 +34,6 @@ #include <canberra-gtk.h> #endif -#include <libecal/e-cal-client-view.h> -#include <libecal/e-cal-time-util.h> -#include <libecal/e-cal-component.h> - #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> #endif diff --git a/calendar/alarm-notify/alarm-queue.h b/calendar/alarm-notify/alarm-queue.h index e43027bd60..c2e8990527 100644 --- a/calendar/alarm-notify/alarm-queue.h +++ b/calendar/alarm-notify/alarm-queue.h @@ -26,7 +26,7 @@ #ifndef ALARM_QUEUE_H #define ALARM_QUEUE_H -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> void alarm_queue_init (gpointer); void alarm_queue_done (void); diff --git a/calendar/alarm-notify/config-data.c b/calendar/alarm-notify/config-data.c index 5129ed5ce3..94dd813ab8 100644 --- a/calendar/alarm-notify/config-data.c +++ b/calendar/alarm-notify/config-data.c @@ -27,7 +27,6 @@ #endif #include <string.h> -#include <libedataserver/e-source-alarms.h> #include "config-data.h" /* Whether we have initied ourselves by reading diff --git a/calendar/alarm-notify/config-data.h b/calendar/alarm-notify/config-data.h index 8eb0cf8b3e..c97c0f7415 100644 --- a/calendar/alarm-notify/config-data.h +++ b/calendar/alarm-notify/config-data.h @@ -27,7 +27,7 @@ #define CONFIG_DATA_H #include <libical/ical.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> icaltimezone * config_data_get_timezone (void); gboolean config_data_get_24_hour_format (void); diff --git a/calendar/alarm-notify/notify-main.c b/calendar/alarm-notify/notify-main.c index c0d8d725ab..0ddfc5866b 100644 --- a/calendar/alarm-notify/notify-main.c +++ b/calendar/alarm-notify/notify-main.c @@ -32,8 +32,6 @@ #include <dbus/dbus-glib.h> -#include <libedataserver/e-gdbus-templates.h> - #include "alarm-notify.h" #ifdef G_OS_WIN32 diff --git a/calendar/alarm-notify/util.c b/calendar/alarm-notify/util.c index 891ea131bc..0eee6d5510 100644 --- a/calendar/alarm-notify/util.c +++ b/calendar/alarm-notify/util.c @@ -27,8 +27,7 @@ #endif #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libecal/e-cal-time-util.h> + #include "config-data.h" #include "util.h" diff --git a/calendar/alarm-notify/util.h b/calendar/alarm-notify/util.h index bb6935729a..a95f6d8e11 100644 --- a/calendar/alarm-notify/util.h +++ b/calendar/alarm-notify/util.h @@ -26,7 +26,7 @@ #ifndef UTIL_H #define UTIL_H -#include <libecal/e-cal-component.h> +#include <libecal/libecal.h> gchar *timet_to_str_with_zone (time_t t, icaltimezone *zone); gchar *calculate_time (time_t start, time_t end); 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, diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 664d758cda..f2b65f0798 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -35,12 +35,10 @@ #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.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" diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 742ab11a9d..1290a6784f 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -22,10 +22,7 @@ #include "e-composer-header-table.h" #include <glib/gi18n-lib.h> -#include <libedataserverui/e-name-selector.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <misc/e-mail-signature-combo-box.h> diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index b76e9b6395..3e7e16c527 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -18,7 +18,7 @@ #ifndef E_COMPOSER_HEADER_TABLE_H #define E_COMPOSER_HEADER_TABLE_H -#include <libebook/e-destination.h> +#include <libebook/libebook.h> #include <shell/e-shell.h> #include <composer/e-composer-header.h> diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index 24bfb7d5bc..9bb665320d 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -19,7 +19,7 @@ #define E_COMPOSER_HEADER_H #include <composer/e-composer-common.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_COMPOSER_HEADER \ diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h index cb4dc03abf..b745941a3e 100644 --- a/composer/e-composer-name-header.h +++ b/composer/e-composer-name-header.h @@ -18,8 +18,8 @@ #ifndef E_COMPOSER_NAME_HEADER_H #define E_COMPOSER_NAME_HEADER_H -#include <libebook/e-destination.h> -#include <libedataserverui/e-name-selector.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <composer/e-composer-header.h> diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 4c40872797..4370b1a12b 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -30,13 +30,7 @@ #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-signature.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-openpgp.h> -#include <libedataserver/e-source-smime.h> +#include <libebackend/libebackend.h> #include "e-composer-actions.h" #include "e-composer-activity.h" diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 318165d740..a85993fd87 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -25,8 +25,9 @@ #define E_MSG_COMPOSER_H #include <camel/camel.h> -#include <libebook/e-destination.h> #include <gtkhtml-editor.h> +#include <libebook/libebook.h> + #include <misc/e-attachment-view.h> #include <misc/e-focus-tracker.h> #include <misc/e-web-view-gtkhtml.h> diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 0c7f7b3250..7f6ef95782 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -5,7 +5,7 @@ ruledir = $(privdatadir) include $(top_srcdir)/glib-gen.mak glib_enum_headers=e-util-enums.h glib_enum_output=e-util-enumtypes -glib_enum_define=E +glib_enum_define=E_UTIL glib_enum_prefix=e ENUM_GENERATED = e-util-enumtypes.h e-util-enumtypes.c diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 9beeb92df2..519fc5db32 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -29,8 +29,8 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-categories.h> -#include <libedataserverui/e-categories-dialog.h> + +#include <libedataserverui/libedataserverui.h> #include "e-util/e-util.h" diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index fd11abaf62..9519074179 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -25,9 +25,7 @@ #include <glib/gi18n.h> -#include <libebackend/e-module.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-xml-utils.h> +#include <libebackend/libebackend.h> #include "e-plugin.h" #include "e-util-private.h" diff --git a/e-util/e-source-util.h b/e-util/e-source-util.h index 589e91b13c..304a55f696 100644 --- a/e-util/e-source-util.h +++ b/e-util/e-source-util.h @@ -25,7 +25,7 @@ #ifndef E_SOURCE_UTIL_H #define E_SOURCE_UTIL_H -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <e-util/e-activity.h> #include <libevolution-utils/e-alert-sink.h> diff --git a/e-util/e-util.c b/e-util/e-util.c index 38c1b85244..f3b71c58f6 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -51,8 +51,7 @@ #endif #include <camel/camel.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-categories.h> +#include <libedataserver/libedataserver.h> #include "filter/e-filter-option.h" diff --git a/e-util/e-util.h b/e-util/e-util.h index af2232489e..be3150bc80 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -28,16 +28,13 @@ #include <limits.h> #include <gconf/gconf-client.h> +#include <libedataserver/libedataserver.h> + #include <libevolution-utils/evolution-util.h> + #include <e-util/e-marshal.h> #include <e-util/e-util-enums.h> -#include <libedataserver/e-source-registry.h> - -/* e_get_user_data_dir() used to live here, so #include its new home - * for backward-compatibility (not that we really care about that). */ -#include <libedataserver/e-data-server-util.h> - G_BEGIN_DECLS typedef enum { diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c index 0e2bbdcd7e..c9079bc556 100644 --- a/filter/e-rule-context.c +++ b/filter/e-rule-context.c @@ -39,7 +39,7 @@ #include <glib/gi18n.h> -#include <libedataserver/e-xml-utils.h> +#include <libedataserver/libedataserver.h> #include "libevolution-utils/e-alert-dialog.h" #include "libevolution-utils/e-xml-utils.h" diff --git a/libemail-engine/e-mail-authenticator.h b/libemail-engine/e-mail-authenticator.h index bcc3299d1a..864d32dea0 100644 --- a/libemail-engine/e-mail-authenticator.h +++ b/libemail-engine/e-mail-authenticator.h @@ -20,7 +20,7 @@ #define E_MAIL_AUTHENTICATOR_H #include <camel/camel.h> -#include <libedataserver/e-source-authenticator.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_AUTHENTICATOR \ diff --git a/libemail-engine/e-mail-junk-filter.h b/libemail-engine/e-mail-junk-filter.h index 74a7840c2d..375a0f2c60 100644 --- a/libemail-engine/e-mail-junk-filter.h +++ b/libemail-engine/e-mail-junk-filter.h @@ -20,7 +20,7 @@ #define E_MAIL_JUNK_FILTER_H #include <gtk/gtk.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> /* Standard GObject macros */ #define E_TYPE_MAIL_JUNK_FILTER \ diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c index 26d4639867..0c05a26df9 100644 --- a/libemail-engine/e-mail-session-utils.c +++ b/libemail-engine/e-mail-session-utils.c @@ -23,7 +23,7 @@ #include "e-mail-session-utils.h" #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-submission.h> +#include <libedataserver/libedataserver.h> #include <libemail-engine/e-mail-folder-utils.h> #include <libemail-engine/e-mail-utils.h> diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c index ee1427ef7d..c2eb5d3905 100644 --- a/libemail-engine/e-mail-session.c +++ b/libemail-engine/e-mail-session.c @@ -42,18 +42,8 @@ #include <canberra-gtk.h> #endif -#include <libedataserver/e-flag.h> -#include <libedataserver/e-proxy.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mail-transport.h> -#include <libedataserver/e-source-refresh.h> -#include <libedataserverui/e-passwords.h> -#include <libedataserver/e-data-server-util.h> +#include <libebackend/libebackend.h> +#include <libedataserverui/libedataserverui.h> #include "libemail-utils/mail-mt.h" diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h index bf436c7f1c..bd4b2f6727 100644 --- a/libemail-engine/e-mail-session.h +++ b/libemail-engine/e-mail-session.h @@ -26,7 +26,7 @@ #define E_MAIL_SESSION_H #include <camel/camel.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> #include <libemail-engine/e-mail-enums.h> #include <libemail-engine/mail-folder-cache.h> #include <libemail-utils/em-vfolder-context.h> diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index 3838de3547..9e13a74aa8 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -36,22 +36,8 @@ #undef interface #endif -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> - #include <glib/gi18n.h> - -#include <gio/gio.h> - -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-flag.h> -#include <libedataserver/e-proxy.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> +#include <libebook/libebook.h> #include <libemail-utils/mail-mt.h> diff --git a/libemail-engine/e-mail-utils.h b/libemail-engine/e-mail-utils.h index b3782876f4..505249a0ac 100644 --- a/libemail-engine/e-mail-utils.h +++ b/libemail-engine/e-mail-utils.h @@ -23,7 +23,7 @@ #define E_MAIL_UTILS_H #include <camel/camel.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> gboolean em_utils_folder_is_drafts (ESourceRegistry *registry, CamelFolder *folder); diff --git a/libemail-engine/mail-config.c b/libemail-engine/mail-config.c index af193f5844..04753aa9fd 100644 --- a/libemail-engine/mail-config.c +++ b/libemail-engine/mail-config.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #include "e-mail-folder-utils.h" #include "mail-config.h" diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c index ebc392fb62..6ce4e2d1ca 100644 --- a/libemail-engine/mail-folder-cache.c +++ b/libemail-engine/mail-folder-cache.c @@ -38,7 +38,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #include <libemail-utils/mail-mt.h> diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c index 91e424b2f7..9e821a0fcf 100644 --- a/libemail-engine/mail-ops.c +++ b/libemail-engine/mail-ops.c @@ -34,9 +34,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-submission.h> +#include <libedataserver/libedataserver.h> #include <libemail-utils/mail-mt.h> diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c index ae73ae6b1f..25b33689b7 100644 --- a/libemail-utils/mail-mt.c +++ b/libemail-utils/mail-mt.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> -#include <libedataserver/e-flag.h> +#include <libedataserver/libedataserver.h> #include "mail-mt.h" diff --git a/libevolution-utils/e-alert.c b/libevolution-utils/e-alert.c index 7171e743a3..7983083103 100644 --- a/libevolution-utils/e-alert.c +++ b/libevolution-utils/e-alert.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-xml-utils.h> +#include <libedataserver/libedataserver.h> #include "e-alert.h" #include "e-alert-sink.h" diff --git a/mail/e-http-request.c b/mail/e-http-request.c index cc2ec62ea8..a9415b248a 100644 --- a/mail/e-http-request.c +++ b/mail/e-http-request.c @@ -26,7 +26,6 @@ #include <webkit/webkit.h> #include <e-util/e-util.h> -#include <libedataserver/e-flag.h> #include <string.h> diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c index 5cf6012351..9fa71ecbf9 100644 --- a/mail/e-mail-account-manager.c +++ b/mail/e-mail-account-manager.c @@ -22,8 +22,6 @@ #include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h> -#include <libedataserver/e-source-collection.h> - #include <libemail-engine/e-mail-session.h> #include <mail/e-mail-account-tree-view.h> diff --git a/mail/e-mail-account-manager.h b/mail/e-mail-account-manager.h index a17ff2a317..2ae3ad519a 100644 --- a/mail/e-mail-account-manager.h +++ b/mail/e-mail-account-manager.h @@ -20,7 +20,7 @@ #define E_MAIL_ACCOUNT_MANAGER_H #include <gtk/gtk.h> -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <mail/e-mail-account-store.h> /* Standard GObject macros */ diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index 1c5dedf52e..502493b5b6 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -22,8 +22,7 @@ #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-collection.h> +#include <libebackend/libebackend.h> #include <e-util/e-marshal.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c index e3588a8964..65d735394a 100644 --- a/mail/e-mail-autoconfig.c +++ b/mail/e-mail-autoconfig.c @@ -34,10 +34,6 @@ /* For error codes. */ #include <libsoup/soup.h> -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-transport.h> - #define E_MAIL_AUTOCONFIG_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_AUTOCONFIG, EMailAutoconfigPrivate)) diff --git a/mail/e-mail-autoconfig.h b/mail/e-mail-autoconfig.h index 5b03ace7a3..b0cfb93b13 100644 --- a/mail/e-mail-autoconfig.h +++ b/mail/e-mail-autoconfig.h @@ -19,8 +19,7 @@ #ifndef E_MAIL_AUTOCONFIG_H #define E_MAIL_AUTOCONFIG_H -#include <gio/gio.h> -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_AUTOCONFIG \ diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 60e506d09d..19150cca03 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -31,10 +31,6 @@ #include <string.h> #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-submission.h> #include <shell/e-shell.h> diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c index e81a1980ce..16d0e2e42a 100644 --- a/mail/e-mail-config-assistant.c +++ b/mail/e-mail-config-assistant.c @@ -21,12 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mail-transport.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-sink.h> diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c index f58da035b6..ac3585ad08 100644 --- a/mail/e-mail-config-confirm-page.c +++ b/mail/e-mail-config-confirm-page.c @@ -21,7 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #define E_MAIL_CONFIG_CONFIRM_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c index d815f0560c..ae4f14029d 100644 --- a/mail/e-mail-config-defaults-page.c +++ b/mail/e-mail-config-defaults-page.c @@ -21,14 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-enumtypes.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mdn.h> -#include <libedataserver/e-data-server-util.h> +#include <libebackend/libebackend.h> #include <libemail-engine/e-mail-folder-utils.h> diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c index a0920ab1a3..b42f0dd49f 100644 --- a/mail/e-mail-config-identity-page.c +++ b/mail/e-mail-config-identity-page.c @@ -21,8 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-mail-identity.h> +#include <libebackend/libebackend.h> #include <e-util/e-marshal.h> #include <misc/e-mail-signature-combo-box.h> diff --git a/mail/e-mail-config-identity-page.h b/mail/e-mail-config-identity-page.h index 51d879e45f..cfc6ea139e 100644 --- a/mail/e-mail-config-identity-page.h +++ b/mail/e-mail-config-identity-page.h @@ -20,7 +20,7 @@ #define E_MAIL_CONFIG_IDENTITY_PAGE_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> #include <mail/e-mail-config-page.h> diff --git a/mail/e-mail-config-notebook.c b/mail/e-mail-config-notebook.c index 999ee1baf2..70f790dd3f 100644 --- a/mail/e-mail-config-notebook.c +++ b/mail/e-mail-config-notebook.c @@ -18,9 +18,7 @@ #include "e-mail-config-notebook.h" -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-goa.h> -#include <libedataserver/e-source-mail-identity.h> +#include <libebackend/libebackend.h> #include <mail/e-mail-config-defaults-page.h> #include <mail/e-mail-config-identity-page.h> diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c index 1474ff3263..b4d3bd6c90 100644 --- a/mail/e-mail-config-provider-page.c +++ b/mail/e-mail-config-provider-page.c @@ -22,8 +22,7 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-data-server-util.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-sink.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/mail/e-mail-config-provider-page.h b/mail/e-mail-config-provider-page.h index fbbdf7f34a..8278151a00 100644 --- a/mail/e-mail-config-provider-page.h +++ b/mail/e-mail-config-provider-page.h @@ -21,7 +21,6 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libedataserver/e-source-registry.h> #include <e-util/e-activity.h> #include <mail/e-mail-config-page.h> diff --git a/mail/e-mail-config-receiving-page.c b/mail/e-mail-config-receiving-page.c index 7106f20414..aef28b1ce1 100644 --- a/mail/e-mail-config-receiving-page.c +++ b/mail/e-mail-config-receiving-page.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-account.h> - /* Forward Declarations */ static void e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *interface); diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c index 911e40bb47..a41e251175 100644 --- a/mail/e-mail-config-security-page.c +++ b/mail/e-mail-config-security-page.c @@ -21,10 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-openpgp.h> -#include <libedataserver/e-source-smime.h> +#include <libebackend/libebackend.h> #if defined (HAVE_NSS) #include <smime/gui/e-cert-selector.h> diff --git a/mail/e-mail-config-security-page.h b/mail/e-mail-config-security-page.h index 79174eaed0..5efa1f49bc 100644 --- a/mail/e-mail-config-security-page.h +++ b/mail/e-mail-config-security-page.h @@ -20,7 +20,7 @@ #define E_MAIL_CONFIG_SECURITY_PAGE_H #include <gtk/gtk.h> -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <mail/e-mail-config-page.h> diff --git a/mail/e-mail-config-sending-page.c b/mail/e-mail-config-sending-page.c index 198a3ea4ac..4f11b003d1 100644 --- a/mail/e-mail-config-sending-page.c +++ b/mail/e-mail-config-sending-page.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-transport.h> - /* Forward Declarations */ static void e_mail_config_sending_page_interface_init (EMailConfigPageInterface *interface); diff --git a/mail/e-mail-config-service-backend.c b/mail/e-mail-config-service-backend.c index a4c97fcd18..49019c5fb7 100644 --- a/mail/e-mail-config-service-backend.c +++ b/mail/e-mail-config-service-backend.c @@ -18,10 +18,6 @@ #include "e-mail-config-service-backend.h" -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-backend.h> -#include <libedataserver/e-source-collection.h> - #include <mail/e-mail-config-receiving-page.h> #include <mail/e-mail-config-sending-page.h> diff --git a/mail/e-mail-config-service-backend.h b/mail/e-mail-config-service-backend.h index 6ba4ad3d13..87e2d3663d 100644 --- a/mail/e-mail-config-service-backend.h +++ b/mail/e-mail-config-service-backend.h @@ -21,8 +21,7 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source.h> +#include <libebackend/libebackend.h> #include <mail/e-mail-autoconfig.h> diff --git a/mail/e-mail-config-service-page.c b/mail/e-mail-config-service-page.c index 1f53ed5ddb..41618affe1 100644 --- a/mail/e-mail-config-service-page.c +++ b/mail/e-mail-config-service-page.c @@ -22,8 +22,7 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-backend.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-sink.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/mail/e-mail-config-service-page.h b/mail/e-mail-config-service-page.h index 3c5a40e1c0..513356fd26 100644 --- a/mail/e-mail-config-service-page.h +++ b/mail/e-mail-config-service-page.h @@ -25,8 +25,6 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libedataserver/e-source-extension.h> -#include <libedataserver/e-source-registry.h> #include <e-util/e-activity.h> #include <mail/e-mail-autoconfig.h> diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c index db6520ab1f..03a9ed19b4 100644 --- a/mail/e-mail-config-summary-page.c +++ b/mail/e-mail-config-summary-page.c @@ -22,15 +22,7 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> - -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-collection.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mail-transport.h> -#include <libedataserver/e-source-security.h> +#include <libebackend/libebackend.h> #define E_MAIL_CONFIG_SUMMARY_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/e-mail-config-summary-page.h b/mail/e-mail-config-summary-page.h index 564207c9e1..2bfc03af8e 100644 --- a/mail/e-mail-config-summary-page.h +++ b/mail/e-mail-config-summary-page.h @@ -20,7 +20,6 @@ #define E_MAIL_CONFIG_SUMMARY_PAGE_H #include <gtk/gtk.h> -#include <libedataserver/e-source.h> #include <mail/e-mail-config-page.h> #include <mail/e-mail-config-service-backend.h> diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c index 6cb9fd19a6..905c42849c 100644 --- a/mail/e-mail-config-welcome-page.c +++ b/mail/e-mail-config-welcome-page.c @@ -21,7 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #define E_MAIL_CONFIG_WELCOME_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c index 746e1c3e80..18cd143a7d 100644 --- a/mail/e-mail-config-window.c +++ b/mail/e-mail-config-window.c @@ -21,10 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-collection.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-submission.h> - #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> #include <misc/e-alert-bar.h> diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c index a485a1e0d2..8f913bb7c8 100644 --- a/mail/e-mail-migrate.c +++ b/mail/e-mail-migrate.c @@ -48,12 +48,6 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <libedataserver/e-xml-utils.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-mail-account.h> - #include <shell/e-shell.h> #include <shell/e-shell-migrate.h> diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 29910d8c4a..24db42dda9 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -27,8 +27,6 @@ #include <glib/gi18n.h> #include "e-mail-paned-view.h" -#include <libedataserver/e-data-server-util.h> - #include "e-util/e-util-private.h" #include "widgets/menus/gal-view-etable.h" #include "widgets/menus/gal-view-instance.h" diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 1bd80b20d5..af8a0eea94 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -28,8 +28,6 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libedataserver/e-source-mail-account.h> - #ifdef HAVE_XFREE #include <X11/XF86keysym.h> #endif diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c index f5f5bddf3b..e946bbbe9a 100644 --- a/mail/e-mail-ui-session.c +++ b/mail/e-mail-ui-session.c @@ -42,11 +42,8 @@ #include <canberra-gtk.h> #endif -#include <libedataserver/e-flag.h> -#include <libedataserver/e-proxy.h> -#include <libedataserver/e-source-mail-account.h> -#include <libebackend/e-extensible.h> -#include <libedataserverui/e-passwords.h> +#include <libebackend/libebackend.h> +#include <libedataserverui/libedataserverui.h> #include "e-mail-account-store.h" diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index a39a5f834d..4fe141447a 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -30,13 +30,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mdn.h> - #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> #include <e-util/e-util.h> diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 4362b11dc2..007591d346 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -32,9 +32,6 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> - #include <shell/e-shell.h> #include <filter/e-filter-part.h> diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index d533c47fea..b264beef31 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -36,11 +36,6 @@ #include <glib/gi18n.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> - #include <e-util/e-util.h> #include <shell/e-shell.h> diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 47dbba8439..efa5881542 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -50,8 +50,6 @@ #include <shell/e-shell.h> #include <shell/e-shell-utils.h> -#include <libedataserver/e-flag.h> - #if defined (HAVE_NSS) && defined (ENABLE_SMIME) #include "certificate-viewer.h" #include "e-cert-db.h" diff --git a/mail/em-format-html.c b/mail/em-format-html.c index f60346dc24..bb80d3957b 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -42,9 +42,7 @@ #undef interface #endif -#include <libebackend/e-extensible.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ +#include <libebackend/libebackend.h> #include "e-util/e-datetime-format.h" #include "e-util/e-icon-factory.h" diff --git a/mail/em-utils.c b/mail/em-utils.c index 11dc1217c7..bf75253d34 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -45,22 +45,7 @@ #include <glib/gi18n.h> -#include <gio/gio.h> - -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-flag.h> -#include <libedataserver/e-proxy.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-composition.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-flag.h> -#include <libedataserver/e-proxy.h> +#include <libebook/libebook.h> #include <e-util/e-util.h> #include <e-util/e-util-private.h> diff --git a/mail/em-utils.h b/mail/em-utils.h index 303f0efddd..092b75933c 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -26,7 +26,6 @@ #include <gtk/gtk.h> #include <sys/types.h> #include <camel/camel.h> -#include <libedataserver/e-proxy.h> #include <libemail-engine/e-mail-session.h> #include <libemail-engine/e-mail-utils.h> diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index f59557cf6d..b5dcd38cd7 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -38,10 +38,7 @@ #include <gconf/gconf-client.h> -#include <libebook/e-book-client.h> -#include <libebook/e-destination.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-address-book.h> +#include <libebook/libebook.h> #include "mail-importer.h" diff --git a/mail/mail-guess-servers.c b/mail/mail-guess-servers.c index 21f1868bc2..f9e602bfef 100644 --- a/mail/mail-guess-servers.c +++ b/mail/mail-guess-servers.c @@ -42,8 +42,6 @@ #include <libxml/tree.h> #include <libxml/xmlmemory.h> -#include <libedataserver/e-proxy.h> - #include <shell/e-shell.h> #include <e-util/e-util-private.h> diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index d68b928124..a132327585 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -29,9 +29,6 @@ #include <glib/gi18n.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-submission.h> - #include <shell/e-shell.h> #include <e-util/e-util.h> diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index d57e8f50ea..615328992a 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -24,12 +24,8 @@ #include "autocompletion-config.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserverui/e-name-selector-entry.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-datetime-format.h" #include "misc/e-autocomplete-selector.h" diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index ac6f8b27b6..8aa7070af6 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -27,12 +27,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebook/e-book-client.h> -#include <libedataserver/e-url.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-book-auth-util.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-import.h" #include "shell/e-shell.h" diff --git a/modules/addressbook/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h index 92bb716d72..63c395cab7 100644 --- a/modules/addressbook/e-book-shell-content.h +++ b/modules/addressbook/e-book-shell-content.h @@ -22,7 +22,7 @@ #ifndef E_BOOK_SHELL_CONTENT_H #define E_BOOK_SHELL_CONTENT_H -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <shell/e-shell-content.h> #include <shell/e-shell-searchbar.h> diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c index 57ea7d3a2c..b7f8b61ef9 100644 --- a/modules/addressbook/e-book-shell-sidebar.c +++ b/modules/addressbook/e-book-shell-sidebar.c @@ -28,8 +28,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-source-address-book.h> - #include <e-util/e-util.h> #include "e-book-shell-view.h" diff --git a/modules/addressbook/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h index bf1cdd0baa..9e4d9ec015 100644 --- a/modules/addressbook/e-book-shell-sidebar.h +++ b/modules/addressbook/e-book-shell-sidebar.h @@ -22,7 +22,7 @@ #ifndef E_BOOK_SHELL_SIDEBAR_H #define E_BOOK_SHELL_SIDEBAR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index a110d37771..928e5e2eb9 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -27,11 +27,8 @@ #include <string.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libebook/e-book-client.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-sexp.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-util.h" #include "e-util/e-file-utils.h" diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c index 9f17dd34d5..90af295ded 100644 --- a/modules/addressbook/eab-composer-util.c +++ b/modules/addressbook/eab-composer-util.c @@ -24,8 +24,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebook/e-contact.h> -#include <libebook/e-destination.h> +#include <libebook/libebook.h> #include "composer/e-msg-composer.h" #include "addressbook/util/eab-book-util.h" diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c index 75a070a353..925315b8af 100644 --- a/modules/backup-restore/evolution-backup-restore.c +++ b/modules/backup-restore/evolution-backup-restore.c @@ -28,7 +28,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <mail/e-mail-config-assistant.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 38a477e00d..7d1caaf948 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -29,7 +29,7 @@ #include <glib/gstdio.h> #include <gtk/gtk.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #ifdef G_OS_WIN32 #ifdef DATADIR diff --git a/modules/book-config-google/evolution-book-config-google.c b/modules/book-config-google/evolution-book-config-google.c index c924c65d6e..3d49be1f12 100644 --- a/modules/book-config-google/evolution-book-config-google.c +++ b/modules/book-config-google/evolution-book-config-google.c @@ -19,9 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-security.h> +#include <libebackend/libebackend.h> #include <misc/e-interval-chooser.h> #include <misc/e-source-config-backend.h> diff --git a/modules/book-config-ldap/e-source-ldap.c b/modules/book-config-ldap/e-source-ldap.c index 4e182dc625..88ee6bc634 100644 --- a/modules/book-config-ldap/e-source-ldap.c +++ b/modules/book-config-ldap/e-source-ldap.c @@ -20,9 +20,7 @@ #include <ldap.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-security.h> +#include <libedataserver/libedataserver.h> #define E_SOURCE_LDAP_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/book-config-ldap/e-source-ldap.h b/modules/book-config-ldap/e-source-ldap.h index ea9cb9fd8c..118346192b 100644 --- a/modules/book-config-ldap/e-source-ldap.h +++ b/modules/book-config-ldap/e-source-ldap.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_LDAP_H #define E_SOURCE_LDAP_H -#include <libedataserver/e-source-extension.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_LDAP \ diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c index a957e4c94a..e174783f6f 100644 --- a/modules/book-config-ldap/evolution-book-config-ldap.c +++ b/modules/book-config-ldap/evolution-book-config-ldap.c @@ -20,8 +20,7 @@ #include <stdlib.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-dialog.h> #include <misc/e-source-config-backend.h> diff --git a/modules/book-config-local/evolution-book-config-local.c b/modules/book-config-local/evolution-book-config-local.c index 0f7bb2c78d..6cbcc27a0d 100644 --- a/modules/book-config-local/evolution-book-config-local.c +++ b/modules/book-config-local/evolution-book-config-local.c @@ -19,7 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config-backend.h> #include <addressbook/gui/widgets/e-book-source-config.h> diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c b/modules/book-config-webdav/evolution-book-config-webdav.c index cccb7922d9..c352a3365f 100644 --- a/modules/book-config-webdav/evolution-book-config-webdav.c +++ b/modules/book-config-webdav/evolution-book-config-webdav.c @@ -19,9 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config-backend.h> #include <addressbook/gui/widgets/e-book-source-config.h> diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c index 841007bc85..e5904fb4c5 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.c +++ b/modules/cal-config-caldav/e-caldav-chooser.c @@ -28,12 +28,7 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-authenticator.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-webdav.h> -#include <libedataserverui/e-cell-renderer-color.h> -#include <libedataserverui/e-passwords.h> +#include <libedataserverui/libedataserverui.h> #define E_CALDAV_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/cal-config-caldav/e-caldav-chooser.h b/modules/cal-config-caldav/e-caldav-chooser.h index b436161fdb..3c48b42675 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.h +++ b/modules/cal-config-caldav/e-caldav-chooser.h @@ -20,8 +20,7 @@ #define E_CALDAV_CHOOSER_H #include <gtk/gtk.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> /* Standard GObject macros */ #define E_TYPE_CALDAV_CHOOSER \ diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c index 0d8d6dd6cf..932f55a059 100644 --- a/modules/cal-config-caldav/evolution-cal-config-caldav.c +++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c @@ -19,10 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-security.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <misc/e-interval-chooser.h> #include <misc/e-source-config-backend.h> diff --git a/modules/cal-config-contacts/e-contacts-selector.c b/modules/cal-config-contacts/e-contacts-selector.c index 80b10754aa..1386177346 100644 --- a/modules/cal-config-contacts/e-contacts-selector.c +++ b/modules/cal-config-contacts/e-contacts-selector.c @@ -18,8 +18,6 @@ #include "e-contacts-selector.h" -#include <libedataserver/e-source-address-book.h> - #include "e-source-contacts.h" G_DEFINE_DYNAMIC_TYPE ( diff --git a/modules/cal-config-contacts/e-contacts-selector.h b/modules/cal-config-contacts/e-contacts-selector.h index 0afb02113f..5ba1ea9dca 100644 --- a/modules/cal-config-contacts/e-contacts-selector.h +++ b/modules/cal-config-contacts/e-contacts-selector.h @@ -19,7 +19,7 @@ #ifndef E_CONTACTS_SELECTOR_H #define E_CONTACTS_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_CONTACTS_SELECTOR \ diff --git a/modules/cal-config-contacts/e-source-contacts.h b/modules/cal-config-contacts/e-source-contacts.h index 95d9b8363c..d18fd92d0e 100644 --- a/modules/cal-config-contacts/e-source-contacts.h +++ b/modules/cal-config-contacts/e-source-contacts.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_CONTACTS_H #define E_SOURCE_CONTACTS_H -#include <libedataserver/e-source-extension.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_CONTACTS \ diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c index 6b0fa896ec..b310917170 100644 --- a/modules/cal-config-contacts/evolution-cal-config-contacts.c +++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c @@ -19,7 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config-backend.h> #include <calendar/gui/e-cal-source-config.h> diff --git a/modules/cal-config-google/e-google-chooser-button.c b/modules/cal-config-google/e-google-chooser-button.c index 700760811d..2613bf7385 100644 --- a/modules/cal-config-google/e-google-chooser-button.c +++ b/modules/cal-config-google/e-google-chooser-button.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-webdav.h> - #include "e-google-chooser-dialog.h" #define E_GOOGLE_CHOOSER_BUTTON_GET_PRIVATE(obj) \ diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c index d5a4064b0f..9dd2b326e7 100644 --- a/modules/cal-config-google/e-google-chooser.c +++ b/modules/cal-config-google/e-google-chooser.c @@ -23,11 +23,7 @@ #include <gdata/gdata.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-webdav.h> -#include <libedataserverui/e-cell-renderer-color.h> -#include <libedataserverui/e-passwords.h> +#include <libedataserverui/libedataserverui.h> #define E_GOOGLE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/cal-config-google/e-google-chooser.h b/modules/cal-config-google/e-google-chooser.h index f2cd28a6c5..8c973142e9 100644 --- a/modules/cal-config-google/e-google-chooser.h +++ b/modules/cal-config-google/e-google-chooser.h @@ -20,7 +20,7 @@ #define E_GOOGLE_CHOOSER_H #include <gtk/gtk.h> -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_GOOGLE_CHOOSER \ diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index 589adf5aec..eb2f1337a0 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -19,10 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config-backend.h> #include <calendar/gui/e-cal-source-config.h> diff --git a/modules/cal-config-local/e-source-local.h b/modules/cal-config-local/e-source-local.h index 7eed749966..3d534f8849 100644 --- a/modules/cal-config-local/e-source-local.h +++ b/modules/cal-config-local/e-source-local.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_LOCAL_H #define E_SOURCE_LOCAL_H -#include <libedataserver/e-source-extension.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_LOCAL \ diff --git a/modules/cal-config-local/evolution-cal-config-local.c b/modules/cal-config-local/evolution-cal-config-local.c index ab83f8c68c..a8f7696033 100644 --- a/modules/cal-config-local/evolution-cal-config-local.c +++ b/modules/cal-config-local/evolution-cal-config-local.c @@ -19,7 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config-backend.h> #include <calendar/gui/e-cal-source-config.h> diff --git a/modules/cal-config-weather/e-source-weather.c b/modules/cal-config-weather/e-source-weather.c index 0f7e581ce8..e00c79907a 100644 --- a/modules/cal-config-weather/e-source-weather.c +++ b/modules/cal-config-weather/e-source-weather.c @@ -18,8 +18,6 @@ #include "e-source-weather.h" -#include <libedataserver/e-data-server-util.h> - #define E_SOURCE_WEATHER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_SOURCE_WEATHER, ESourceWeatherPrivate)) diff --git a/modules/cal-config-weather/e-source-weather.h b/modules/cal-config-weather/e-source-weather.h index 85ad991f64..fd191cf27b 100644 --- a/modules/cal-config-weather/e-source-weather.h +++ b/modules/cal-config-weather/e-source-weather.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_WEATHER_H #define E_SOURCE_WEATHER_H -#include <libedataserver/e-source-extension.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_WEATHER \ diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c index c6e8c47d08..28df80eb1f 100644 --- a/modules/cal-config-weather/evolution-cal-config-weather.c +++ b/modules/cal-config-weather/evolution-cal-config-weather.c @@ -19,7 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include <libgweather/location-entry.h> diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c b/modules/cal-config-webcal/evolution-cal-config-webcal.c index 9a42219c10..94a209b77f 100644 --- a/modules/cal-config-webcal/evolution-cal-config-webcal.c +++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c @@ -19,9 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <misc/e-interval-chooser.h> #include <misc/e-source-config-backend.h> diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index dedab0241d..efe087da3f 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -27,11 +27,9 @@ #include <glib/gi18n.h> #include <libical/ical.h> -#include <libecal/e-cal-client.h> #include <camel/camel.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c index d0d6e11b90..56fa6e5133 100644 --- a/modules/calendar/e-cal-config-calendar-item.c +++ b/modules/calendar/e-cal-config-calendar-item.c @@ -22,7 +22,7 @@ #include "e-cal-config-calendar-item.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <misc/e-calendar-item.h> diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c index dc37c748c3..c2d296cefc 100644 --- a/modules/calendar/e-cal-config-comp-editor.c +++ b/modules/calendar/e-cal-config-comp-editor.c @@ -22,7 +22,7 @@ #include "e-cal-config-comp-editor.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <calendar/gui/dialogs/comp-editor.h> diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c index 48a5848f73..f936a0b182 100644 --- a/modules/calendar/e-cal-config-date-edit.c +++ b/modules/calendar/e-cal-config-date-edit.c @@ -22,7 +22,7 @@ #include "e-cal-config-date-edit.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <misc/e-dateedit.h> diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c index 7b4f2dec30..570d14eec6 100644 --- a/modules/calendar/e-cal-config-meeting-store.c +++ b/modules/calendar/e-cal-config-meeting-store.c @@ -22,7 +22,7 @@ #include "e-cal-config-meeting-store.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <calendar/gui/e-meeting-store.h> diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c index 249d541274..c54ccde39b 100644 --- a/modules/calendar/e-cal-config-meeting-time-selector.c +++ b/modules/calendar/e-cal-config-meeting-time-selector.c @@ -22,7 +22,7 @@ #include "e-cal-config-meeting-time-selector.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <calendar/gui/e-meeting-time-sel.h> diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c index f7a0e162af..8c9bcc0229 100644 --- a/modules/calendar/e-cal-config-model.c +++ b/modules/calendar/e-cal-config-model.c @@ -22,7 +22,7 @@ #include "e-cal-config-model.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <calendar/gui/e-cal-model.h> diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c index afe747dd80..8883f4fadf 100644 --- a/modules/calendar/e-cal-config-view.c +++ b/modules/calendar/e-cal-config-view.c @@ -22,7 +22,7 @@ #include "e-cal-config-view.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <calendar/gui/e-day-view.h> diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index c49ad8a571..a5283b0fe8 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -27,12 +27,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-url.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-import.h" #include "shell/e-shell.h" diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index 045ca28f3b..943e28e38f 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -25,7 +25,7 @@ #include "e-cal-shell-settings.h" -#include <libecal/e-cal-util.h> +#include <libecal/libecal.h> #include <e-util/e-util.h> #include <e-util/e-util-enumtypes.h> diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 5cecc3ca40..63d14658d5 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -27,8 +27,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libedataserverui/libedataserverui.h> #include "libevolution-utils/e-alert-dialog.h" #include "widgets/misc/e-paned.h" diff --git a/modules/calendar/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h index d687c63c74..2ddfff0a20 100644 --- a/modules/calendar/e-cal-shell-sidebar.h +++ b/modules/calendar/e-cal-shell-sidebar.h @@ -22,8 +22,8 @@ #ifndef E_CAL_SHELL_SIDEBAR_H #define E_CAL_SHELL_SIDEBAR_H -#include <libecal/e-cal-client.h> -#include <libedataserverui/e-source-selector.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index 2687c74f52..4a08388736 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -27,13 +27,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-time-util.h> -#include <libecal/e-cal-system-timezone.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-sexp.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-selection.h> #include <e-util/e-dialog-utils.h> diff --git a/modules/calendar/e-calendar-preferences.h b/modules/calendar/e-calendar-preferences.h index 5cb05e50b4..a9809f2bcf 100644 --- a/modules/calendar/e-calendar-preferences.h +++ b/modules/calendar/e-calendar-preferences.h @@ -24,10 +24,9 @@ #ifndef CAL_PREFERENCES_H #define CAL_PREFERENCES_H -#include <gtk/gtk.h> +#include <libedataserverui/libedataserverui.h> + #include <shell/e-shell.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-source-selector.h> #include <widgets/misc/e-preferences-window.h> /* Standard GObject macros */ diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index efafe383f0..be69870116 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -27,11 +27,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-url.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include "shell/e-shell.h" #include "shell/e-shell-backend.h" diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index c42ce3e3bd..bc342830b2 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -27,9 +27,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libedataserverui/libedataserverui.h> #include "libevolution-utils/e-alert-dialog.h" #include "e-util/e-util.h" diff --git a/modules/calendar/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h index 298673c2fa..b0de9f5fe4 100644 --- a/modules/calendar/e-memo-shell-sidebar.h +++ b/modules/calendar/e-memo-shell-sidebar.h @@ -22,8 +22,8 @@ #ifndef E_MEMO_SHELL_SIDEBAR_H #define E_MEMO_SHELL_SIDEBAR_H -#include <libecal/e-cal-client.h> -#include <libedataserverui/e-source-selector.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h index c232901008..84def2810a 100644 --- a/modules/calendar/e-memo-shell-view-private.h +++ b/modules/calendar/e-memo-shell-view-private.h @@ -26,8 +26,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-sexp.h> #include "e-util/e-dialog-utils.h" #include "e-util/e-file-utils.h" diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index f8c21a8e41..7ecad1c986 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -27,11 +27,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-url.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include "shell/e-shell.h" #include "shell/e-shell-backend.h" diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index d8969aa85c..9e28af2411 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -27,9 +27,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-client-utils.h> +#include <libedataserverui/libedataserverui.h> #include "libevolution-utils/e-alert-dialog.h" #include "e-util/e-util.h" diff --git a/modules/calendar/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h index a2cc92ac0e..7518a4b856 100644 --- a/modules/calendar/e-task-shell-sidebar.h +++ b/modules/calendar/e-task-shell-sidebar.h @@ -22,8 +22,8 @@ #ifndef E_TASK_SHELL_SIDEBAR_H #define E_TASK_SHELL_SIDEBAR_H -#include <libecal/e-cal-client.h> -#include <libedataserverui/e-source-selector.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h index d76ee1cab6..1bb0c5ce4e 100644 --- a/modules/calendar/e-task-shell-view-private.h +++ b/modules/calendar/e-task-shell-view-private.h @@ -26,10 +26,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-sexp.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-dialog-utils.h" #include "e-util/e-file-utils.h" diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c index 893db7f966..e24b1640c0 100644 --- a/modules/composer-autosave/e-composer-autosave.c +++ b/modules/composer-autosave/e-composer-autosave.c @@ -20,7 +20,7 @@ #include <config.h> #endif -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-dialog.h> #include <composer/e-msg-composer.h> diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c index 03c227b64d..76736c8fe6 100644 --- a/modules/composer-autosave/e-composer-registry.c +++ b/modules/composer-autosave/e-composer-registry.c @@ -21,7 +21,7 @@ #endif #include <glib/gstdio.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <shell/e-shell-window.h> diff --git a/modules/imap-features/e-mail-config-imap-headers-page.c b/modules/imap-features/e-mail-config-imap-headers-page.c index 6c9eaecbcb..e40d9f88ab 100644 --- a/modules/imap-features/e-mail-config-imap-headers-page.c +++ b/modules/imap-features/e-mail-config-imap-headers-page.c @@ -21,9 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-camel.h> -#include <libedataserver/e-source-mail-account.h> - #include <mail/e-mail-config-security-page.h> #include "e-mail-config-header-manager.h" diff --git a/modules/imap-features/e-mail-config-imap-headers-page.h b/modules/imap-features/e-mail-config-imap-headers-page.h index 87a1a50ff6..b99d9898aa 100644 --- a/modules/imap-features/e-mail-config-imap-headers-page.h +++ b/modules/imap-features/e-mail-config-imap-headers-page.h @@ -20,7 +20,7 @@ #define E_MAIL_CONFIG_IMAP_HEADERS_PAGE_H #include <gtk/gtk.h> -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <mail/e-mail-config-page.h> diff --git a/modules/imap-features/evolution-imap-features.c b/modules/imap-features/evolution-imap-features.c index 1b99daf62d..e6f2922017 100644 --- a/modules/imap-features/evolution-imap-features.c +++ b/modules/imap-features/evolution-imap-features.c @@ -19,8 +19,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-mail-account.h> +#include <libebackend/libebackend.h> #include <mail/e-mail-config-notebook.h> diff --git a/modules/mail-config/e-mail-config-google-summary.c b/modules/mail-config/e-mail-config-google-summary.c index c53202f68f..e4e383d3f8 100644 --- a/modules/mail-config/e-mail-config-google-summary.c +++ b/modules/mail-config/e-mail-config-google-summary.c @@ -21,11 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-collection.h> -#include <libedataserver/e-source-mail-identity.h> - #include <mail/e-mail-config-summary-page.h> #define E_MAIL_CONFIG_GOOGLE_SUMMARY_GET_PRIVATE(obj) \ diff --git a/modules/mail-config/e-mail-config-google-summary.h b/modules/mail-config/e-mail-config-google-summary.h index 22c0c6fc14..54a8e218e5 100644 --- a/modules/mail-config/e-mail-config-google-summary.h +++ b/modules/mail-config/e-mail-config-google-summary.h @@ -19,7 +19,7 @@ #ifndef E_MAIL_CONFIG_GOOGLE_SUMMARY_H #define E_MAIL_CONFIG_GOOGLE_SUMMARY_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> /* Standard GObject macros */ #define E_TYPE_MAIL_CONFIG_GOOGLE_SUMMARY \ diff --git a/modules/mail-config/e-mail-config-local-accounts.c b/modules/mail-config/e-mail-config-local-accounts.c index c796065919..1f36eedcdf 100644 --- a/modules/mail-config/e-mail-config-local-accounts.c +++ b/modules/mail-config/e-mail-config-local-accounts.c @@ -20,7 +20,7 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <mail/e-mail-config-service-page.h> diff --git a/modules/mail-config/e-mail-config-remote-accounts.c b/modules/mail-config/e-mail-config-remote-accounts.c index 3fae662c8a..984438e768 100644 --- a/modules/mail-config/e-mail-config-remote-accounts.c +++ b/modules/mail-config/e-mail-config-remote-accounts.c @@ -20,9 +20,7 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-backend.h> -#include <libedataserver/e-data-server-util.h> +#include <libebackend/libebackend.h> #include <misc/e-port-entry.h> diff --git a/modules/mail-config/e-mail-config-smtp-backend.c b/modules/mail-config/e-mail-config-smtp-backend.c index 15b3814afe..0a9a65abfa 100644 --- a/modules/mail-config/e-mail-config-smtp-backend.c +++ b/modules/mail-config/e-mail-config-smtp-backend.c @@ -22,9 +22,7 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-backend.h> -#include <libedataserver/e-data-server-util.h> +#include <libebackend/libebackend.h> #include <misc/e-port-entry.h> diff --git a/modules/mail-config/e-mail-config-yahoo-summary.c b/modules/mail-config/e-mail-config-yahoo-summary.c index d922845ba1..204424ca1a 100644 --- a/modules/mail-config/e-mail-config-yahoo-summary.c +++ b/modules/mail-config/e-mail-config-yahoo-summary.c @@ -21,11 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-collection.h> -#include <libedataserver/e-source-mail-identity.h> - #include <mail/e-mail-config-summary-page.h> #define E_MAIL_CONFIG_YAHOO_SUMMARY_GET_PRIVATE(obj) \ diff --git a/modules/mail-config/e-mail-config-yahoo-summary.h b/modules/mail-config/e-mail-config-yahoo-summary.h index 33de592992..d80170110a 100644 --- a/modules/mail-config/e-mail-config-yahoo-summary.h +++ b/modules/mail-config/e-mail-config-yahoo-summary.h @@ -19,7 +19,7 @@ #ifndef E_MAIL_CONFIG_YAHOO_SUMMARY_H #define E_MAIL_CONFIG_YAHOO_SUMMARY_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> /* Standard GObject macros */ #define E_TYPE_MAIL_CONFIG_YAHOO_SUMMARY \ diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c index dad5f9a518..527f720159 100644 --- a/modules/mail/e-mail-config-format-html.c +++ b/modules/mail/e-mail-config-format-html.c @@ -22,7 +22,7 @@ #include "e-mail-config-format-html.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <e-util/e-util.h> diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c index b284fbdd8d..3926d05a7d 100644 --- a/modules/mail/e-mail-config-reader.c +++ b/modules/mail/e-mail-config-reader.c @@ -22,7 +22,7 @@ #include "e-mail-config-reader.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <mail/e-mail-reader.h> diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c index 813256efd1..12e75dfbdf 100644 --- a/modules/mail/e-mail-config-web-view.c +++ b/modules/mail/e-mail-config-web-view.c @@ -25,7 +25,7 @@ #include "e-mail-config-web-view.h" -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> #include <misc/e-web-view.h> diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 2f8e9c8b71..f5bb100c39 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -27,9 +27,6 @@ #include <glib/gi18n.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-mail-transport.h> - #include <e-util/e-import.h> #include <e-util/e-util.h> diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 1bf6d4e29a..15d477a3c0 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -26,7 +26,6 @@ #include "e-mail-shell-content.h" #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> #include <e-util/e-util-private.h> diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index f9c3ba2080..4a7f342085 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -27,7 +27,6 @@ #include <glib/gi18n.h> #include <gtkhtml/gtkhtml.h> #include <camel/camel-search-private.h> /* for camel_search_word */ -#include <libedataserver/e-source-mail-account.h> #include <e-util/e-util.h> #include <e-util/e-ui-manager.h> diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index cf20b8f777..00334d7559 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -33,8 +33,6 @@ #include <gtkhtml/gtkhtml-properties.h> #include <libxml/tree.h> -#include "libedataserverui/e-cell-renderer-color.h" - #include <e-util/e-util.h> #include <e-util/e-datetime-format.h> #include <e-util/e-util-private.h> diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c index 98e03516ce..d31d27e45e 100644 --- a/modules/mailto-handler/evolution-mailto-handler.c +++ b/modules/mailto-handler/evolution-mailto-handler.c @@ -21,7 +21,7 @@ #endif #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c index 41243d335c..c30e875982 100644 --- a/modules/mdn/evolution-mdn.c +++ b/modules/mdn/evolution-mdn.c @@ -20,11 +20,7 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-submission.h> -#include <libedataserver/e-source-mdn.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c index 4c3678f477..3a600c093e 100644 --- a/modules/offline-alert/evolution-offline-alert.c +++ b/modules/offline-alert/evolution-offline-alert.c @@ -20,7 +20,7 @@ #include <config.h> #endif -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell-view.h> #include <shell/e-shell-window-actions.h> diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c index 10e3223976..df07b9a7ac 100644 --- a/modules/online-accounts/camel-sasl-xoauth.c +++ b/modules/online-accounts/camel-sasl-xoauth.c @@ -24,8 +24,6 @@ #include <goa/goa.h> -#include <libedataserver/e-source-goa.h> - #include <libemail-engine/e-mail-session.h> #include "camel-sasl-xoauth.h" diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index f95af37b23..482f3368fe 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -23,7 +23,7 @@ #include <string.h> #include <stdio.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <e-util/e-plugin.h> #include <shell/e-shell-window.h> diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 3c34f296b5..ef3cdb5afe 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -21,8 +21,7 @@ #endif #include <glib/gi18n-lib.h> -#include <libebackend/e-extension.h> -#include <libedataserver/e-source-mail-account.h> +#include <libebackend/libebackend.h> #include <shell/e-shell.h> diff --git a/modules/web-inspector/evolution-web-inspector.c b/modules/web-inspector/evolution-web-inspector.c index 27a21e0693..5a7585fbbb 100644 --- a/modules/web-inspector/evolution-web-inspector.c +++ b/modules/web-inspector/evolution-web-inspector.c @@ -20,7 +20,7 @@ #include <glib/gi18n-lib.h> #include <misc/e-web-view.h> -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> /* Standard GObject macros */ #define E_TYPE_WEB_INSPECTOR \ diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 43f9814210..c78bdca1fd 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -28,10 +28,7 @@ #include <glib/gi18n.h> #include <string.h> -#include <libebook/e-book-client.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserverui/e-source-combo-box.h> -#include <libedataserverui/e-client-utils.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-config.h> #include <addressbook/gui/widgets/eab-config.h> diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 9104e0896b..8681592921 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -37,8 +37,7 @@ #define GAIM_ADDRESSBOOK 1 #define AUTOMATIC_CONTACTS_ADDRESSBOOK 0 -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> /* bbdb.c */ /* creates an EBookClient for a given type (gaim or contacts), but doesn't open it; diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 2f304cbdd8..9d01ccd6cb 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -42,9 +42,7 @@ #include <glib/gi18n.h> #include <string.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libedataserverui/e-source-combo-box.h> +#include <libedataserverui/libedataserverui.h> #include <sys/time.h> #include <sys/stat.h> diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index b985a8bdd4..02f5f63fd0 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -47,6 +47,9 @@ #include <glib/gprintf.h> #include <gtk/gtk.h> +#include <libecal/libecal.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-import.h> #include <e-util/e-plugin.h> @@ -56,14 +59,6 @@ #include <shell/e-shell-window.h> #include <shell/e-shell-view.h> -#include <libebook/e-contact.h> - -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> - -#include <libedataserver/e-data-server-util.h> -#include <libedataserverui/e-source-selector-dialog.h> - #include <libemail-utils/mail-mt.h> #include <libemail-engine/mail-tools.h> diff --git a/plugins/itip-formatter/e-conflict-search-selector.c b/plugins/itip-formatter/e-conflict-search-selector.c index c1c1f0ef3b..8f497f5d4f 100644 --- a/plugins/itip-formatter/e-conflict-search-selector.c +++ b/plugins/itip-formatter/e-conflict-search-selector.c @@ -18,8 +18,6 @@ #include "e-conflict-search-selector.h" -#include <libedataserver/e-source-calendar.h> - #include "e-source-conflict-search.h" /* This forces the GType to be registered in a way that diff --git a/plugins/itip-formatter/e-conflict-search-selector.h b/plugins/itip-formatter/e-conflict-search-selector.h index 64981d8e55..091e1c9328 100644 --- a/plugins/itip-formatter/e-conflict-search-selector.h +++ b/plugins/itip-formatter/e-conflict-search-selector.h @@ -19,7 +19,7 @@ #ifndef E_CONFLICT_SEARCH_SELECTOR_H #define E_CONFLICT_SEARCH_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_CONFLICT_SEARCH_SELECTOR \ diff --git a/plugins/itip-formatter/e-source-conflict-search.h b/plugins/itip-formatter/e-source-conflict-search.h index d574bbd2b9..f91fcc4d43 100644 --- a/plugins/itip-formatter/e-source-conflict-search.h +++ b/plugins/itip-formatter/e-source-conflict-search.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_CONFLICT_SEARCH_H #define E_SOURCE_CONFLICT_SEARCH_H -#include <libedataserver/e-source-extension.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_CONFLICT_SEARCH \ diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index ed5ab58fda..6780d09505 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -28,12 +28,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <libevolution-utils/e-alert-dialog.h> #include <e-util/e-mktemp.h> diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 30ec17157c..16388f7232 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -26,11 +26,8 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserverui/e-source-combo-box.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-time-util.h> +#include <libedataserverui/libedataserverui.h> + #include <mail/em-format-hook.h> #include <mail/em-format-html.h> #include <e-util/e-util.h> diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h index d7ebd5b5b1..2e35aec39d 100644 --- a/plugins/itip-formatter/itip-view.h +++ b/plugins/itip-formatter/itip-view.h @@ -28,8 +28,7 @@ #include <unistd.h> #include <gtk/gtk.h> #include <webkit/webkitdom.h> -#include <libecal/e-cal-client.h> -#include <libedataserver/e-source-registry.h> +#include <libecal/libecal.h> /* Standard GObject macros */ #define ITIP_TYPE_VIEW \ diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index bafcfc568a..e74cece640 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -32,14 +32,8 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> -#include <libedataserver/e-flag.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserverui/e-source-selector-dialog.h> -#include <libedataserverui/e-client-utils.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> #include <libemail-engine/e-mail-utils.h> diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index f33c6e2a4f..3b541d0352 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -29,8 +29,6 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-account.h> - #include <e-util/e-util.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 3294176f96..319e7b71f4 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -39,24 +39,13 @@ #include <glib/gprintf.h> #include <gtk/gtk.h> +#include <libecal/libecal.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <e-util/e-import.h> #include <e-util/e-plugin.h> -#include <libebook/e-contact.h> -#include <libebook/e-book-client.h> - -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-component.h> - -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-combo-box.h> -#include <libedataserverui/e-source-selector-dialog.h> - #include <libemail-utils/mail-mt.h> #include <libemail-engine/mail-tools.h> diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 57e0d2e899..ccba649037 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -29,8 +29,7 @@ #include <gconf/gconf-client.h> #include <glib/gi18n.h> #include <gio/gio.h> -#include <libedataserver/e-url.h> -#include <libedataserverui/e-passwords.h> + #include <calendar/gui/e-cal-config.h> #include <shell/es-event.h> #include <e-util/e-util.h> diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index d6ba7e5c74..c2ec12e100 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -27,12 +27,6 @@ #include <string.h> #include <time.h> #include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-client-utils.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-util.h> -#include <libecal/e-cal-time-util.h> #include <shell/e-shell.h> diff --git a/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h index 6d758f1465..8279315be3 100644 --- a/plugins/publish-calendar/publish-format-fb.h +++ b/plugins/publish-calendar/publish-format-fb.h @@ -21,7 +21,8 @@ * */ -#include <gio/gio.h> +#include <libecal/libecal.h> + #include "publish-location.h" #ifndef PUBLISH_FORMAT_FB_H diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index 8ff029301a..08c8c287d5 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -26,11 +26,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserver/e-source-registry.h> -#include <libedataserverui/e-client-utils.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-util.h> #include <shell/e-shell.h> diff --git a/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h index d4955ca9dd..fc9638a253 100644 --- a/plugins/publish-calendar/publish-format-ical.h +++ b/plugins/publish-calendar/publish-format-ical.h @@ -21,7 +21,8 @@ * */ -#include <gio/gio.h> +#include <libecal/libecal.h> + #include "publish-location.h" #ifndef PUBLISH_FORMAT_ICAL_H diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index 4bb4271037..12fd8a3b5b 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -26,11 +26,11 @@ #endif #include "publish-location.h" + +#include <string.h> #include <libxml/tree.h> #include <gconf/gconf-client.h> -#include <libedataserver/e-url.h> -#include <libedataserverui/e-passwords.h> -#include <string.h> +#include <libedataserverui/libedataserverui.h> static EPublishUri * migrateURI (const gchar *xml, diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index ea697fd185..c5483d5e14 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -29,10 +29,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-source-calendar.h> -#include <libedataserverui/e-passwords.h> -#include <libedataserver/e-url.h> - #include <e-util/e-util.h> #include <e-util/e-util-private.h> diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 7283c6fd1b..96fb154c6f 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -24,7 +24,7 @@ #define URL_EDITOR_DIALOG_H #include <gtk/gtk.h> -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> #include "publish-location.h" G_BEGIN_DECLS diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 9d5dad8d98..de59cd558c 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -24,15 +24,8 @@ #include <config.h> #endif -#include <gtk/gtk.h> -#include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserverui/e-client-utils.h> -#include <libecal/e-cal-client.h> #include <string.h> +#include <glib/gi18n.h> #include "format-handler.h" diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h index b7376920ef..4a2dbab985 100644 --- a/plugins/save-calendar/format-handler.h +++ b/plugins/save-calendar/format-handler.h @@ -20,11 +20,8 @@ * */ -#include <gtk/gtk.h> -#include <gio/gio.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-source-selector.h> -#include <libecal/e-cal-client.h> +#include <libecal/libecal.h> +#include <libedataserverui/libedataserverui.h> typedef struct _FormatHandler FormatHandler; diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 01f7ff8ada..da908a1a11 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -25,14 +25,8 @@ #include <config.h> #endif -#include <gtk/gtk.h> -#include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-source-selector.h> -#include <libedataserverui/e-client-utils.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-util.h> #include <string.h> +#include <glib/gi18n.h> #include "format-handler.h" diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index a68e570c87..b042ee0fe9 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -24,21 +24,15 @@ #include <config.h> #endif -#include <gtk/gtk.h> +#include <string.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector.h> -#include <libecal/e-cal-client.h> -#include <libecal/e-cal-time-util.h> -#include <libedataserver/e-data-server-util.h> + #include <libxml/xmlmemory.h> #include <libxml/parser.h> #include <libxml/tree.h> #include <libxml/xmlIO.h> #include <libxml/xpath.h> -#include <string.h> #include "format-handler.h" diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 818c5a328c..6577335519 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -27,15 +27,11 @@ #include <config.h> #endif -#include <gio/gio.h> -#include <gtk/gtk.h> +#include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-source-selector.h> -#include <libecal/e-cal-client.h> + #include <libevolution-utils/e-alert-dialog.h> #include <e-util/e-plugin.h> -#include <string.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 6ed9580e00..3b5885adbc 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -22,11 +22,8 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <libebook/e-book-client.h> -#include <libebook/e-contact.h> -#include <libedataserver/e-source-address-book.h> -#include <libedataserverui/e-client-utils.h> -#include <libedataserverui/e-source-selector-dialog.h> +#include <libebook/libebook.h> +#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <addressbook/gui/merging/eab-contact-merging.h> diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h index 759a3bdcb7..cd8cf1416e 100644 --- a/shell/e-shell-backend.h +++ b/shell/e-shell-backend.h @@ -22,7 +22,7 @@ #ifndef E_SHELL_BACKEND_H #define E_SHELL_BACKEND_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <shell/e-shell-common.h> #include <e-util/e-activity.h> diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 24850aeb40..fe35f66676 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -32,7 +32,7 @@ #include "e-shell-content.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-util/e-util.h" #include "libevolution-utils/e-alert-dialog.h" diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index faf40275e9..d746aeff54 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -25,12 +25,13 @@ #include "e-shell-migrate.h" +#include <libedataserver/libedataserver.h> + #include <errno.h> #include <string.h> #include <unistd.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-xml-utils.h> #include "libevolution-utils/e-alert-dialog.h" #include "e-util/e-file-utils.h" diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c index 4299904c70..644293b2a2 100644 --- a/shell/e-shell-searchbar.c +++ b/shell/e-shell-searchbar.c @@ -32,7 +32,7 @@ #include "e-shell-searchbar.h" #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-util/e-util.h" #include "widgets/misc/e-action-combo-box.h" diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c index 040d35fac1..d869a2a63a 100644 --- a/shell/e-shell-sidebar.c +++ b/shell/e-shell-sidebar.c @@ -31,7 +31,7 @@ #include "e-shell-sidebar.h" -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <libevolution-utils/e-alert-sink.h> #include <e-util/e-unicode.h> diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c index 74d1a0538f..efbc311945 100644 --- a/shell/e-shell-switcher.c +++ b/shell/e-shell-switcher.c @@ -32,7 +32,7 @@ #include "e-shell-switcher.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #define E_SHELL_SWITCHER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c index e272524fa1..3a3d311f7d 100644 --- a/shell/e-shell-taskbar.c +++ b/shell/e-shell-taskbar.c @@ -31,7 +31,7 @@ #include "e-shell-taskbar.h" -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-shell-view.h> #include <misc/e-activity-proxy.h> diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index eef69d6182..1fd63a91e3 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -33,7 +33,7 @@ #include <glib/gi18n-lib.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #include "widgets/misc/e-import-assistant.h" diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index bd66ce2897..fdad1cbd19 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -33,7 +33,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-util/e-file-utils.h" #include "e-util/e-plugin-ui.h" diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 0d7aee01ae..726777f2d4 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -22,7 +22,7 @@ #ifndef E_SHELL_VIEW_H #define E_SHELL_VIEW_H -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <shell/e-shell-common.h> #include <shell/e-shell-backend.h> diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index e05b24b700..293a39b645 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -30,8 +30,7 @@ #include <e-util/e-print.h> #include <gal-define-views-dialog.h> -#include <libedataserverui/e-passwords.h> -#include <libedataserverui/e-categories-editor.h> +#include <libedataserverui/libedataserverui.h> #define EVOLUTION_COPYRIGHT \ "Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others\n" \ diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h index cbb027ca8a..7a2a40cc3f 100644 --- a/shell/e-shell-window-private.h +++ b/shell/e-shell-window-private.h @@ -27,7 +27,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <e-util/e-util-private.h> diff --git a/shell/e-shell.c b/shell/e-shell.c index ae2641fac4..ae8abb2a50 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -32,9 +32,8 @@ #include "e-shell.h" #include <glib/gi18n.h> -#include <libebackend/e-module.h> -#include <libebackend/e-extensible.h> -#include <libedataserverui/e-passwords.h> +#include <libebackend/libebackend.h> +#include <libedataserverui/libedataserverui.h> #include "e-util/e-util.h" #include "e-util/e-util-private.h" diff --git a/shell/e-shell.h b/shell/e-shell.h index 786e6c8d44..4dcd7e7921 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -22,7 +22,7 @@ #ifndef E_SHELL_H #define E_SHELL_H -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> #include <e-util/e-activity.h> #include <libevolution-utils/e-alert.h> diff --git a/shell/killev.c b/shell/killev.c index f444fad0b8..9c99130762 100644 --- a/shell/killev.c +++ b/shell/killev.c @@ -29,7 +29,7 @@ #include <gio/gio.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> /* Seconds to wait after asking Evolution to terminate gracefully. * If the process has not terminated before the timeout expires, diff --git a/shell/main.c b/shell/main.c index 6db7947ea5..521f817623 100644 --- a/shell/main.c +++ b/shell/main.c @@ -58,9 +58,7 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <libedataserver/e-categories.h> -#include <libedataserver/e-gdbus-templates.h> -#include <libedataserverui/e-passwords.h> +#include <libedataserverui/libedataserverui.h> #include "e-shell.h" #include "e-shell-migrate.h" diff --git a/smime/gui/component.c b/smime/gui/component.c index e902f43fd0..bf172194c1 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserverui/e-passwords.h> +#include <libedataserverui/libedataserverui.h> #include "ca-trust-dialog.h" #include "e-cert-db.h" diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 7cc7fc0939..c9dc1cae24 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -50,6 +50,8 @@ #include <camel/camel.h> /* FIXME: this is where camel_init is defined; it shouldn't include everything else */ +#include <libedataserverui/libedataserverui.h> + /* private NSS defines used by PSM */ /* (must be declated before cert.h) */ #define CERT_NewTempCertificate __CERT_NewTempCertificate @@ -74,7 +76,6 @@ #include "prmem.h" #include "e-util/e-util.h" #include "e-util/e-util-private.h" -#include <libedataserverui/e-passwords.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index 0849634767..c3d0b7e351 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -46,7 +46,6 @@ #include <time.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ #include <e-util/e-util.h> diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 7bdc9e7f1c..bc6377a0a1 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -46,12 +46,13 @@ #include <glib/gstdio.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserverui/e-passwords.h> #include <time.h> #include <fcntl.h> #include <unistd.h> +#include <libedataserverui/libedataserverui.h> + #include "e-cert-db.h" #include "e-pkcs12.h" diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 58fda69559..5445efe61b 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -28,8 +28,8 @@ #include <string.h> #include <glib/gi18n.h> #include <misc/e-map.h> -#include <libecal/e-cal-time-util.h> -#include <libecal/e-cal-system-timezone.h> + +#include <libecal/libecal.h> #include "e-util/e-util.h" #include "e-util/e-util-private.h" diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index b22e4f37c9..e05e1533cf 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -29,7 +29,7 @@ #include <errno.h> #include <libxml/parser.h> -#include <libedataserver/e-xml-utils.h> +#include <libedataserver/libedataserver.h> #include <glib/gi18n.h> #include "e-util/e-util.h" diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 5fab5abd0c..2bb621b7ea 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -34,10 +34,10 @@ #include <gtk/gtk.h> #include <libxml/parser.h> #include <glib/gstdio.h> -#include <libedataserver/e-xml-utils.h> -#include <libedataserver/e-data-server-util.h> - #include <glib/gi18n.h> + +#include <libedataserver/libedataserver.h> + #include "e-util/e-util.h" #include "libevolution-utils/e-xml-utils.h" #include "e-util/e-unicode.h" diff --git a/widgets/misc/e-alarm-selector.c b/widgets/misc/e-alarm-selector.c index 3a61663a0c..bdc1b7e35e 100644 --- a/widgets/misc/e-alarm-selector.c +++ b/widgets/misc/e-alarm-selector.c @@ -18,9 +18,6 @@ #include "e-alarm-selector.h" -#include <libedataserver/e-source-alarms.h> -#include <libedataserver/e-source-calendar.h> - G_DEFINE_TYPE ( EAlarmSelector, e_alarm_selector, diff --git a/widgets/misc/e-alarm-selector.h b/widgets/misc/e-alarm-selector.h index 2ad9c49dfc..63500866c9 100644 --- a/widgets/misc/e-alarm-selector.h +++ b/widgets/misc/e-alarm-selector.h @@ -19,7 +19,7 @@ #ifndef E_ALARM_SELECTOR_H #define E_ALARM_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_ALARM_SELECTOR \ diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h index 81a883deeb..301f789b07 100644 --- a/widgets/misc/e-attachment-handler.h +++ b/widgets/misc/e-attachment-handler.h @@ -22,7 +22,8 @@ #ifndef E_ATTACHMENT_HANDLER_H #define E_ATTACHMENT_HANDLER_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> + #include <misc/e-attachment-view.h> /* Standard GObject macros */ diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 26ffe9e056..2be8009e8a 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -26,7 +26,7 @@ #include "e-attachment-icon-view.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-attachment.h" #include "e-attachment-store.h" diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index 59a9e43436..9a03d54a28 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -26,7 +26,7 @@ #include "e-attachment-tree-view.h" #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-attachment.h" #include "e-attachment-store.h" diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 08b747f926..526bbbb0c2 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -29,7 +29,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <libedataserver/e-data-server-util.h> +#include <libedataserver/libedataserver.h> #include "e-util/e-icon-factory.h" #include "e-util/e-util.h" diff --git a/widgets/misc/e-autocomplete-selector.c b/widgets/misc/e-autocomplete-selector.c index 38caa835c4..c0bf207bbd 100644 --- a/widgets/misc/e-autocomplete-selector.c +++ b/widgets/misc/e-autocomplete-selector.c @@ -18,9 +18,6 @@ #include "e-autocomplete-selector.h" -#include <libedataserver/e-source-address-book.h> -#include <libedataserver/e-source-autocomplete.h> - G_DEFINE_TYPE ( EAutocompleteSelector, e_autocomplete_selector, diff --git a/widgets/misc/e-autocomplete-selector.h b/widgets/misc/e-autocomplete-selector.h index 8caa13268e..4e44efc7f3 100644 --- a/widgets/misc/e-autocomplete-selector.h +++ b/widgets/misc/e-autocomplete-selector.h @@ -19,7 +19,7 @@ #ifndef E_AUTOCOMPLETE_SELECTOR_H #define E_AUTOCOMPLETE_SELECTOR_H -#include <libedataserverui/e-source-selector.h> +#include <libedataserverui/libedataserverui.h> /* Standard GObject macros */ #define E_TYPE_AUTOCOMPLETE_SELECTOR \ diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 173aad8174..4e821e740b 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -25,7 +25,7 @@ #include <config.h> #endif -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include "e-calendar-item.h" #include "ea-widgets.h" @@ -36,7 +36,6 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> #include <e-util/e-util.h> static const gint e_calendar_item_days_in_month[12] = { diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c index 4661024036..2d31cc8592 100644 --- a/widgets/misc/e-contact-map-window.c +++ b/widgets/misc/e-contact-map-window.c @@ -30,10 +30,6 @@ #include <champlain/champlain.h> -#include <libebook/e-book-client.h> -#include <libebook/e-book-query.h> -#include <libebook/e-contact.h> - #include <string.h> #include <glib/gi18n.h> diff --git a/widgets/misc/e-contact-map-window.h b/widgets/misc/e-contact-map-window.h index a73ce47e46..821fe243d2 100644 --- a/widgets/misc/e-contact-map-window.h +++ b/widgets/misc/e-contact-map-window.h @@ -23,7 +23,7 @@ #include <gtk/gtk.h> -#include <libebook/e-book-client.h> +#include <libebook/libebook.h> #include <e-contact-map.h> diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c index 6e20ac10c9..9d0c6c69ee 100644 --- a/widgets/misc/e-contact-map.c +++ b/widgets/misc/e-contact-map.c @@ -36,8 +36,6 @@ #include <clutter/clutter.h> -#include <libebook/e-contact.h> - #include <string.h> #include <glib/gi18n.h> #include <math.h> diff --git a/widgets/misc/e-contact-map.h b/widgets/misc/e-contact-map.h index a5ff813ad8..d9503e2c9b 100644 --- a/widgets/misc/e-contact-map.h +++ b/widgets/misc/e-contact-map.h @@ -28,7 +28,7 @@ #include <champlain/champlain.h> #include <champlain-gtk/champlain-gtk.h> -#include <libebook/e-contact.h> +#include <libebook/libebook.h> /* Standard GObject macros */ #define E_TYPE_CONTACT_MAP \ diff --git a/widgets/misc/e-contact-marker.h b/widgets/misc/e-contact-marker.h index 996e922e1c..791a9c46b5 100644 --- a/widgets/misc/e-contact-marker.h +++ b/widgets/misc/e-contact-marker.h @@ -25,7 +25,7 @@ #ifdef WITH_CONTACT_MAPS -#include <libebook/e-contact.h> +#include <libebook/libebook.h> #include <champlain/champlain.h> diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 4513aec28f..38b1900e03 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -37,9 +37,9 @@ #include <atk/atkrelation.h> #include <atk/atkrelationset.h> #include <glib/gi18n.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-time-utils.h> -#include <libedataserver/e-data-server-util.h> + +#include <libebackend/libebackend.h> + #include <e-util/e-util.h> #include "e-calendar.h" diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index c0279ed310..75cee65e3c 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -32,7 +32,7 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-util/e-import.h> #include <e-util/e-util-private.h> diff --git a/widgets/misc/e-mail-identity-combo-box.c b/widgets/misc/e-mail-identity-combo-box.c index e43f41d5e4..cfd04b4eda 100644 --- a/widgets/misc/e-mail-identity-combo-box.c +++ b/widgets/misc/e-mail-identity-combo-box.c @@ -18,9 +18,6 @@ #include "e-mail-identity-combo-box.h" -#include <libedataserver/e-source-mail-account.h> -#include <libedataserver/e-source-mail-identity.h> - #define E_MAIL_IDENTITY_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_IDENTITY_COMBO_BOX, EMailIdentityComboBoxPrivate)) diff --git a/widgets/misc/e-mail-identity-combo-box.h b/widgets/misc/e-mail-identity-combo-box.h index a94e0b2ded..691d69bde2 100644 --- a/widgets/misc/e-mail-identity-combo-box.h +++ b/widgets/misc/e-mail-identity-combo-box.h @@ -20,7 +20,7 @@ #define E_MAIL_IDENTITY_COMBO_BOX_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_IDENTITY_COMBO_BOX \ diff --git a/widgets/misc/e-mail-signature-combo-box.c b/widgets/misc/e-mail-signature-combo-box.c index b2c749a34a..40f0d77744 100644 --- a/widgets/misc/e-mail-signature-combo-box.c +++ b/widgets/misc/e-mail-signature-combo-box.c @@ -21,9 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-identity.h> -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_COMBO_BOX, EMailSignatureComboBoxPrivate)) diff --git a/widgets/misc/e-mail-signature-combo-box.h b/widgets/misc/e-mail-signature-combo-box.h index 49abc507c0..d3ddaa9694 100644 --- a/widgets/misc/e-mail-signature-combo-box.h +++ b/widgets/misc/e-mail-signature-combo-box.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_COMBO_BOX_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_COMBO_BOX \ diff --git a/widgets/misc/e-mail-signature-editor.c b/widgets/misc/e-mail-signature-editor.c index 4575fffbb1..34d8a036ad 100644 --- a/widgets/misc/e-mail-signature-editor.c +++ b/widgets/misc/e-mail-signature-editor.c @@ -21,9 +21,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-signature.h> - #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> #include <misc/e-alert-bar.h> diff --git a/widgets/misc/e-mail-signature-editor.h b/widgets/misc/e-mail-signature-editor.h index 5527100bc0..8f1be2dd0f 100644 --- a/widgets/misc/e-mail-signature-editor.h +++ b/widgets/misc/e-mail-signature-editor.h @@ -21,7 +21,7 @@ #include <gtkhtml-editor.h> #include <misc/e-focus-tracker.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_EDITOR \ diff --git a/widgets/misc/e-mail-signature-manager.c b/widgets/misc/e-mail-signature-manager.c index d00787b461..0392316756 100644 --- a/widgets/misc/e-mail-signature-manager.c +++ b/widgets/misc/e-mail-signature-manager.c @@ -22,8 +22,7 @@ #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-source-mail-signature.h> +#include <libedataserver/libedataserver.h> #include "e-mail-signature-preview.h" #include "e-mail-signature-tree-view.h" diff --git a/widgets/misc/e-mail-signature-preview.c b/widgets/misc/e-mail-signature-preview.c index 02d93283ac..0e7500c5ae 100644 --- a/widgets/misc/e-mail-signature-preview.c +++ b/widgets/misc/e-mail-signature-preview.c @@ -23,8 +23,6 @@ #include <unistd.h> #include <glib/gstdio.h> -#include <libedataserver/e-source-mail-signature.h> - #include <libevolution-utils/e-alert-sink.h> #define E_MAIL_SIGNATURE_PREVIEW_GET_PRIVATE(obj) \ diff --git a/widgets/misc/e-mail-signature-preview.h b/widgets/misc/e-mail-signature-preview.h index 205ff62472..fff4c64d3d 100644 --- a/widgets/misc/e-mail-signature-preview.h +++ b/widgets/misc/e-mail-signature-preview.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_PREVIEW_H #include <misc/e-web-view.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_PREVIEW \ diff --git a/widgets/misc/e-mail-signature-script-dialog.c b/widgets/misc/e-mail-signature-script-dialog.c index 757f6a4256..58e8c43157 100644 --- a/widgets/misc/e-mail-signature-script-dialog.c +++ b/widgets/misc/e-mail-signature-script-dialog.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_SCRIPT_DIALOG_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG, \ diff --git a/widgets/misc/e-mail-signature-script-dialog.h b/widgets/misc/e-mail-signature-script-dialog.h index 0b458ab72b..b28521e488 100644 --- a/widgets/misc/e-mail-signature-script-dialog.h +++ b/widgets/misc/e-mail-signature-script-dialog.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_SCRIPT_DIALOG_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG \ diff --git a/widgets/misc/e-mail-signature-tree-view.c b/widgets/misc/e-mail-signature-tree-view.c index 3dd6a85ec8..f1d5d03753 100644 --- a/widgets/misc/e-mail-signature-tree-view.c +++ b/widgets/misc/e-mail-signature-tree-view.c @@ -18,8 +18,6 @@ #include "e-mail-signature-tree-view.h" -#include <libedataserver/e-source-mail-signature.h> - #define E_MAIL_SIGNATURE_TREE_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_SIGNATURE_TREE_VIEW, EMailSignatureTreeViewPrivate)) diff --git a/widgets/misc/e-mail-signature-tree-view.h b/widgets/misc/e-mail-signature-tree-view.h index e3129c9e25..ba2615f6d8 100644 --- a/widgets/misc/e-mail-signature-tree-view.h +++ b/widgets/misc/e-mail-signature-tree-view.h @@ -20,7 +20,7 @@ #define E_MAIL_SIGNATURE_TREE_VIEW_H #include <gtk/gtk.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIGNATURE_TREE_VIEW \ diff --git a/widgets/misc/e-source-config-backend.h b/widgets/misc/e-source-config-backend.h index df0e23d84e..72cef5d4d1 100644 --- a/widgets/misc/e-source-config-backend.h +++ b/widgets/misc/e-source-config-backend.h @@ -19,7 +19,7 @@ #ifndef E_SOURCE_CONFIG_BACKEND_H #define E_SOURCE_CONFIG_BACKEND_H -#include <libebackend/e-extension.h> +#include <libebackend/libebackend.h> #include <misc/e-source-config.h> diff --git a/widgets/misc/e-source-config.c b/widgets/misc/e-source-config.c index 69a238e535..45a3d2d816 100644 --- a/widgets/misc/e-source-config.c +++ b/widgets/misc/e-source-config.c @@ -21,12 +21,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libebackend/e-extensible.h> -#include <libedataserver/e-source-authentication.h> -#include <libedataserver/e-source-backend.h> -#include <libedataserver/e-source-refresh.h> -#include <libedataserver/e-source-security.h> -#include <libedataserver/e-source-webdav.h> +#include <libebackend/libebackend.h> #include <e-util/e-marshal.h> #include <misc/e-interval-chooser.h> diff --git a/widgets/misc/e-source-config.h b/widgets/misc/e-source-config.h index 35ad70ff33..da996b69e8 100644 --- a/widgets/misc/e-source-config.h +++ b/widgets/misc/e-source-config.h @@ -20,8 +20,7 @@ #define E_SOURCE_CONFIG_H #include <gtk/gtk.h> -#include <libedataserver/e-source-extension.h> -#include <libedataserver/e-source-registry.h> +#include <libedataserver/libedataserver.h> /* Standard GObject macros */ #define E_TYPE_SOURCE_CONFIG \ diff --git a/widgets/misc/e-web-view-gtkhtml.c b/widgets/misc/e-web-view-gtkhtml.c index bca66a72a3..6e426ae76e 100644 --- a/widgets/misc/e-web-view-gtkhtml.c +++ b/widgets/misc/e-web-view-gtkhtml.c @@ -26,14 +26,13 @@ #include <glib/gi18n-lib.h> #include <camel/camel.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <e-util/e-plugin-ui.h> #include <libevolution-utils/e-alert-dialog.h> #include <libevolution-utils/e-alert-sink.h> -#include <libebackend/e-extensible.h> - #include "e-popup-action.h" #include "e-selectable.h" diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 07f8357609..af71e2831f 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -31,7 +31,7 @@ #include <pango/pango.h> #include <camel/camel.h> -#include <libebackend/e-extensible.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> #include <libevolution-utils/e-alert-dialog.h> diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index a483460226..aca4b9152c 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -30,7 +30,9 @@ #include <libgnomecanvas/gnome-canvas.h> #include <e-util/e-util.h> #include <glib/gi18n.h> -#include <libedataserver/e-data-server-util.h> + +#include <libedataserver/libedataserver.h> + #include "ea-calendar-item.h" #include "ea-calendar-cell.h" #include "ea-cell-table.h" diff --git a/widgets/misc/test-mail-signatures.c b/widgets/misc/test-mail-signatures.c index 7650195972..597e77effb 100644 --- a/widgets/misc/test-mail-signatures.c +++ b/widgets/misc/test-mail-signatures.c @@ -18,7 +18,7 @@ #include <stdlib.h> -#include <libedataserver/e-source-mail-identity.h> +#include <libedataserver/libedataserver.h> #include <libevolution-utils/e-alert-sink.h> #include <misc/e-mail-identity-combo-box.h> diff --git a/widgets/misc/test-source-config.c b/widgets/misc/test-source-config.c index c7b8ac8932..4a5ce30d91 100644 --- a/widgets/misc/test-source-config.c +++ b/widgets/misc/test-source-config.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <gtk/gtk.h> -#include <libedataserver/e-source-address-book.h> +#include <libedataserver/libedataserver.h> #include "e-source-config-dialog.h" diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index bee042cb2a..70c15dfafd 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -42,7 +42,7 @@ #include <glib/gi18n.h> -#include <libedataserver/e-time-utils.h> +#include <libedataserver/libedataserver.h> /* This depends on ECalendar which is why I didn't put it in gal. */ #include <misc/e-calendar.h> diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 11f35b0f54..5cc0f34652 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -31,7 +31,7 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <libedataserver/e-xml-utils.h> +#include <libedataserver/libedataserver.h> #include "e-util/e-util.h" #include "libevolution-utils/e-xml-utils.h" diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 6449fefe7f..cfc8661388 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -30,7 +30,7 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <libedataserver/e-xml-utils.h> +#include <libedataserver/libedataserver.h> #include "e-util/e-util.h" #include "libevolution-utils/e-xml-utils.h" diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 8e029cd739..47209c4cdf 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -31,7 +31,8 @@ #include <glib/gstdio.h> #include <libxml/tree.h> #include <libxml/parser.h> -#include <libedataserver/e-xml-utils.h> + +#include <libedataserver/libedataserver.h> #include "e-util/e-util.h" #include "libevolution-utils/e-xml-utils.h" |