diff options
Diffstat (limited to 'addressbook/gui/widgets')
18 files changed, 22 insertions, 37 deletions
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" |