diff options
Diffstat (limited to 'plugins')
27 files changed, 37 insertions, 120 deletions
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> |