Various changes to merge in evolution-data-server reliance.

svn path=/trunk/; revision=23206

33 files changed, 42 insertions, 46 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 458e8edbd7..0d6b6e2461 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -54,7 +54,6 @@ libevolution_addressbook_la_LIBADD =							\
 	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.la			\
 	$(top_builddir)/filter/libfilter.la						\
 	$(top_builddir)/addressbook/util/libeabutil.la					\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 32c5ab1288..ddf7b8616a 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -53,7 +53,7 @@
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/util/eab-book-util.h"
 
-#include <ebook/e-book-async.h>
+#include <libebook/e-book-async.h>
 #include <widgets/misc/e-search-bar.h>
 #include <widgets/misc/e-filter-bar.h>
 
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
index 573adbf38d..5e6ff05f64 100644
--- a/addressbook/gui/component/addressbook.h
+++ b/addressbook/gui/component/addressbook.h
@@ -5,7 +5,7 @@
 #include <e-util/e-config-listener.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-moniker-util.h>
-#include <ebook/e-book-async.h>
+#include <libebook/e-book-async.h>
 
 /* use this instead of e_book_load_uri everywhere where you want the
    authentication to be handled for you. */
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index f6d1fc6e5e..59ef7fc6b2 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -70,7 +70,6 @@ libeselectnames_la_SOURCES = 			\
 	e-select-names.h
 
 libeselectnames_la_LIBADD =					\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 # We'll need these again when we split out the select names control
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index 7bfbfd2a5a..39b5f7a008 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -34,10 +34,10 @@
 
 #include <gtk/gtksignal.h>
 
+#include <libebook/e-contact.h>
 #include <addressbook/util/eab-book-util.h>
 #include <addressbook/util/eab-destination.h>
 #include <addressbook/gui/merging/eab-contact-compare.h>
-#include <addressbook/backend/ebook/e-contact.h>
 
 typedef struct {
 	EBook *book;
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
index 435fe80041..4ad1f4fd52 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ b/addressbook/gui/component/select-names/e-select-names-completion.h
@@ -28,7 +28,7 @@
 #define E_SELECT_NAMES_COMPLETION_H
 
 #include <gal/e-text/e-completion.h>
-#include <addressbook/backend/ebook/e-book-async.h>
+#include <libebook/e-book-async.h>
 #include "e-select-names-text-model.h"
 
 G_BEGIN_DECLS
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
index d95aebde5d..74bda7a74b 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-model.c
@@ -16,10 +16,9 @@
 #include <gtk/gtksignal.h>
 
 #include <gal/util/e-util.h>
-
+#include <libebook/e-contact.h>
 #include "e-select-names-model.h"
 #include "e-select-names-marshal.h"
-#include "addressbook/backend/ebook/e-contact.h"
 
 #define MAX_LENGTH 2047
 
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
index 41d5100f59..0d21ee86b3 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-model.h
@@ -15,7 +15,7 @@
 #include <gtk/gtkobject.h>
 #include <stdio.h>
 #include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-contact.h>
+#include <libebook/e-contact.h>
 #include <addressbook/util/eab-destination.h>
 
 #define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
index 14261e9d80..aaa6936c8d 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.c
@@ -14,9 +14,8 @@
 #include <gtk/gtksignal.h>
 #include <gal/util/e-util.h>
 #include <libgnome/gnome-i18n.h>
-
+#include <libebook/e-contact.h>
 #include "e-select-names-table-model.h"
-#include "addressbook/backend/ebook/e-contact.h"
 
 /* Object argument IDs */
 enum {
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index b50a6d0ca0..4423107fca 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -28,9 +28,10 @@
 #include <gal/e-table/e-table-without.h>
 #include <gal/widgets/e-popup-menu.h>
 
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.h>
 #include <addressbook/gui/widgets/e-addressbook-model.h>
 #include <addressbook/gui/widgets/e-addressbook-table-adapter.h>
-#include <addressbook/backend/ebook/e-book-async.h>
 #include <addressbook/util/eab-book-util.h>
 #include <addressbook/gui/component/addressbook-component.h>
 #include <addressbook/gui/component/addressbook-storage.h>
@@ -39,7 +40,6 @@
 #include <shell/evolution-folder-selector-button.h>
 
 #include "e-select-names.h"
-#include <addressbook/backend/ebook/e-contact.h>
 #include "e-select-names-table-model.h"
 #include <gal/widgets/e-categories-master-list-option-menu.h>
 #include <gal/e-text/e-entry.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
index c20f020152..893a2ea2f7 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtkdialog.h>
 #include <glade/glade.h>
-#include <ebook/e-contact.h>
+#include <libebook/e-contact.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 408fcffdc3..0b254c789c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtkdialog.h>
 #include <glade/glade.h>
-#include <ebook/e-contact.h>
+#include <libebook/e-contact.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index efee496539..27baa9f0fc 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -25,8 +25,8 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <glade/glade.h>
 
-#include "addressbook/backend/ebook/e-book-async.h"
-#include "addressbook/backend/ebook/e-contact.h"
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.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 65b321c997..0f59c1145f 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -35,10 +35,10 @@
 #include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-app.h>
+#include <libebook/e-book.h>
+#include <libebook/e-contact.h>
 #include <addressbook/gui/component/addressbook.h>
-#include <addressbook/backend/ebook/e-book.h>
 #include <addressbook/util/eab-book-util.h>
-#include <addressbook/backend/ebook/e-contact.h>
 #include "e-contact-editor.h"
 #include "e-contact-quick-add.h"
 #include "eab-contact-merging.h"
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index ad98c73c23..a969211915 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -27,7 +27,7 @@
 #ifndef __E_CONTACT_QUICK_ADD_H__
 #define __E_CONTACT_QUICK_ADD_H__
 
-#include <addressbook/backend/ebook/e-contact.h>
+#include <libebook/e-contact.h>
 
 typedef void (*EContactQuickAddCallback) (EContact *new_contact, gpointer closure);
 
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 62334c17bf..52e78a6a23 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -26,8 +26,8 @@
 #include <glade/glade.h>
 #include <gal/e-table/e-table-model.h>
 
-#include "addressbook/backend/ebook/e-book-async.h"
-#include "addressbook/backend/ebook/e-contact.h"
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.h>
 
 G_BEGIN_DECLS
 
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 92d3d9bc60..504f31b9d8 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -4,8 +4,8 @@
 
 #include <gtk/gtk.h>
 #include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book-async.h"
-#include "addressbook/backend/ebook/e-contact.h"
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.h>
 #include "addressbook/util/eab-destination.h"
 
 G_BEGIN_DECLS
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index 07a9cd7e35..4b97b3c698 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -28,8 +28,8 @@
 #ifndef __EAB_CONTACT_COMPARE_H__
 #define __EAB_CONTACT_COMPARE_H__
 
-#include "ebook/e-book.h"
-#include "ebook/e-contact.h"
+#include <libebook/e-book.h>
+#include <libebook/e-contact.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 6011263f31..d6d60e57de 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -12,7 +12,7 @@
 #ifndef __E_CONTACT_MERGING_H__
 #define __E_CONTACT_MERGING_H__
 
-#include <addressbook/backend/ebook/e-book-async.h>
+#include <libebook/e-book-async.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
index ef501766ea..8634074f69 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ b/addressbook/gui/search/e-addressbook-search-dialog.h
@@ -21,7 +21,7 @@
 #ifndef __EAB_SEARCH_DIALOG_H__
 #define __EAB_SEARCH_DIALOG_H__
 
-#include <ebook/e-book.h>
+#include <libebook/e-book.h>
 
 #include "addressbook/gui/widgets/e-addressbook-view.h"
 #include "filter/rule-context.h"
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 35f9d0e87f..64ce6c3845 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -4,8 +4,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "addressbook/backend/ebook/e-book-async.h"
-#include "addressbook/backend/ebook/e-book-view.h"
+#include <libebook/e-book-async.h>
+#include <libebook/e-book-view.h>
 
 #define EAB_TYPE_MODEL                  (eab_model_get_type ())
 #define EAB_MODEL(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_MODEL, EABModel))
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index 9ba7d2cf2d..1321b27bb4 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -3,8 +3,8 @@
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
 #include <gal/widgets/e-reflow-model.h>
+#include <libebook/e-contact.h>
 #include "e-addressbook-model.h"
-#include "addressbook/backend/ebook/e-contact.h"
 
 #define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER        (e_addressbook_reflow_adapter_get_type ())
 #define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER, EAddressbookReflowAdapter))
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index 6f4bfd2960..cf139e2bee 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -3,8 +3,8 @@
 #define _EAB_TABLE_ADAPTER_H_
 
 #include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
+#include <libebook/e-book.h>
+#include <libebook/e-book-view.h>
 
 #define E_TYPE_AB_TABLE_ADAPTER                 (eab_table_adapter_get_type ())
 #define EAB_TABLE_ADAPTER(o)                    (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_AB_TABLE_ADAPTER, EAddressbookTableAdapter))
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 1573f682ed..f819704550 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -23,10 +23,10 @@
 #include <gtk/gtkeventbox.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <gal/menus/gal-view-instance.h>
+#include <libebook/e-book.h>
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
 #include "widgets/menus/gal-view-menus.h"
-#include "addressbook/backend/ebook/e-book.h"
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 4e2da4cedf..ef8401b88c 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -21,7 +21,7 @@
 #define __E_MINICARD_VIEW_WIDGET_H__
 
 #include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-book.h"
+#include <libebook/e-book.h>
 #include "e-minicard-view.h"
 
 G_BEGIN_DECLS
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index afd432fd8e..2614b7577a 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -24,7 +24,7 @@
 
 #include <gal/widgets/e-reflow.h>
 #include <gal/widgets/e-selection-model-simple.h>
-#include "addressbook/backend/ebook/e-book.h"
+#include <libebook/e-book.h>
 #include "e-addressbook-reflow-adapter.h"
 
 G_BEGIN_DECLS
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index f9aa893dc3..85060ce156 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -32,7 +32,7 @@
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-canvas-utils.h>
 #include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-book.h"
+#include <libebook/e-book.h>
 #include "eab-marshal.h"
 #include "eab-gui-util.h"
 #include "e-minicard.h"
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index e4673fe4d9..2d0cfd8ed5 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -23,7 +23,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "addressbook/gui/contact-editor/e-contact-editor.h"
 #include <libgnomecanvas/gnome-canvas.h>
-#include "addressbook/backend/ebook/e-contact.h"
+#include <libebook/e-contact.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index 83bad9ae64..e7f47031ce 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -25,7 +25,7 @@
 
 #include <gtk/gtkvbox.h>
 #include <gtkhtml/gtkhtml.h>
-#include <ebook/e-contact.h>
+#include <libebook/e-contact.h>
 
 #define EAB_TYPE_CONTACT_DISPLAY        (eab_contact_display_get_type ())
 #define EAB_CONTACT_DISPLAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EAB_TYPE_CONTACT_DISPLAY, EABContactDisplay))
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 71a80bc7a6..24a0a78577 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -21,7 +21,7 @@
 #define __E_ADDRESSBOOK_UTIL_H__
 
 #include <gtk/gtkwindow.h>
-#include "addressbook/backend/ebook/e-book.h"
+#include <libebook/e-book.h>
 #include "addressbook/gui/contact-editor/e-contact-editor.h"
 #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
 
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index e2d0299d6e..6e2ad6a603 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <gal/widgets/e-popup-menu.h>
-#include <addressbook/backend/ebook/e-book-async.h>
+#include <libebook/e-book-async.h>
 #include <addressbook/util/eab-book-util.h>
 #include <addressbook/gui/contact-editor/e-contact-editor.h>
 #include <addressbook/gui/contact-editor/e-contact-quick-add.h>
diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h
index 4d223f02cb..2feb3ac7d0 100644
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ b/addressbook/gui/widgets/eab-popup-control.h
@@ -28,10 +28,10 @@
 #ifndef __EAB_POPUP_CONTROL_H__
 #define __EAB_POPUP_CONTROL_H__
 
-#include <gtk/gtk.h>
-#include <addressbook/backend/ebook/e-book-async.h>
-#include <addressbook/backend/ebook/e-contact.h>
 #include <bonobo/bonobo-event-source.h>
+#include <gtk/gtk.h>
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
index 82c5fd6032..8e4235d78e 100644
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ b/addressbook/gui/widgets/eab-vcard-control.c
@@ -33,10 +33,10 @@
 #include <bonobo/bonobo-stream-client.h>
 #include <gal/util/e-util.h>
 
+#include <libebook/e-book-async.h>
+#include <libebook/e-contact.h>
 #include <addressbook/gui/component/addressbook.h>
 #include <addressbook/gui/widgets/eab-contact-display.h>
-#include <addressbook/backend/ebook/e-book-async.h>
-#include <addressbook/backend/ebook/e-contact.h>
 #include <addressbook/util/eab-book-util.h>
 
 #include "eab-vcard-control.h"