addressbook/gui/component/addressbook-migrate.c

2004-12-08  Hans Petter Jansson  <hpj@novell.com>

	* addressbook/gui/component/addressbook-migrate.c
	* addressbook/gui/component/select-names/e-select-names-completion.c
	* addressbook/gui/component/select-names/e-select-names-manager.c
	* addressbook/gui/component/select-names/e-select-names-model.h
	* addressbook/gui/contact-list-editor/e-contact-list-editor.h
	* addressbook/gui/contact-list-editor/e-contact-list-model.h
	* addressbook/gui/widgets/e-minicard.c
	* addressbook/gui/widgets/eab-gui-util.c
	* addressbook/importers/evolution-ldif-importer.c
	* addressbook/importers/evolution-vcard-importer.c: Include
	<libebook/e-destination.h> from evolution-data-server.
	* addressbook/util/Makefile.am: Remove e-destination.[ch] from here.
	* addressbook/util/e-destination.[ch]: Removed.

	* plugins/shared-folder/share-folder-common.c: Include
	<libebook/e-destination.h> from evolution-data-server.

	* calendar/gui/e-meeting-list-view.c
	* calendar/gui/e-select-names-editable.c
	* calendar/gui/dialogs/alarm-dialog.c
	* calendar/gui/dialogs/e-delegate-dialog.c: Include
	<libebook/e-destination.h> from evolution-data-server.

	* composer/e-msg-composer-hdrs.h: Include <libebook/e-destination.h>
	from evolution-data-server.

	* mail/importers/pine-importer.c: Include <libebook/e-destination.h>
	from evolution-data-server.

svn path=/trunk/; revision=28094

8 files changed, 8 insertions, 8 deletions

diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 087a867dbb..e2933c2de6 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 
 #include "addressbook-migrate.h"
-#include "e-destination.h"
+#include <libebook/e-destination.h>
 #include <libebook/e-book.h>
 #include <libgnome/gnome-i18n.h>
 #include <gal/util/e-util.h>
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 d3fcc50021..ec0a6b456c 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -36,7 +36,7 @@
 
 #include <libebook/e-contact.h>
 #include <addressbook/util/eab-book-util.h>
-#include <addressbook/util/e-destination.h>
+#include <libebook/e-destination.h>
 #include <addressbook/gui/merging/eab-contact-compare.h>
 
 #include <libedataserver/e-sexp.h>
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index 3f574e608c..0bd3b672e1 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -25,7 +25,7 @@
 #include "e-select-names-completion.h"
 #include "e-select-names-popup.h"
 #include <addressbook/util/eab-book-util.h>
-#include <addressbook/util/e-destination.h>
+#include <libebook/e-destination.h>
 #include "addressbook/gui/component/addressbook.h"
 #include <bonobo/bonobo-object.h>
 
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 10bede3f85..ad9ade5982 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-model.h
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <e-util/e-list.h>
 #include <libebook/e-contact.h>
-#include <addressbook/util/e-destination.h>
+#include <libebook/e-destination.h>
 
 #define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
 #define E_SELECT_NAMES_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))
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 ca6aef85bc..7cc49acbd2 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -30,7 +30,7 @@
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
-#include "addressbook/util/e-destination.h"
+#include <libebook/e-destination.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 0c01dfa7ed..f7d2c50ced 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -4,7 +4,7 @@
 
 #include <gal/e-table/e-table-model.h>
 #include <libebook/e-contact.h>
-#include "addressbook/util/e-destination.h"
+#include <libebook/e-destination.h>
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 8d1b1e2b8f..be827c89be 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -40,7 +40,7 @@
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
 #include <e-util/e-icon-factory.h>
-#include "util/e-destination.h"
+#include <libebook/e-destination.h>
 
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *klass);
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index a88bd4cf82..b6b092c5b1 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -30,7 +30,7 @@
 #include <gal/util/e-util.h>
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
-#include "util/e-destination.h"
+#include <libebook/e-destination.h>
 #include "widgets/misc/e-error.h"
 #include "widgets/misc/e-image-chooser.h"
 #include <e-util/e-icon-factory.h>