find source selector and option menu in libedataserverui

2004-10-13  JP Rosevear  <jpr@novell.com>

	* importers/evolution-vcard-importer.c: find source selector and
	option menu in libedataserverui

	* importers/evolution-ldif-importer.c: ditto

	* gui/widgets/eab-popup.c: ditto

	* gui/widgets/eab-gui-util.c: ditto

	* gui/contact-list-editor/e-contact-list-editor.c: ditto

	* gui/contact-editor/e-contact-editor.c: ditto

	* gui/component/select-names/e-select-names.h: ditto

	* gui/component/autocompletion-config.c: ditto

	* gui/component/addressbook-view.c: ditto

svn path=/trunk/; revision=27568

10 files changed, 32 insertions, 9 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 25830df7b8..c8aa933f09 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,24 @@
+2004-10-13  JP Rosevear  <jpr@novell.com>
+
+	* importers/evolution-vcard-importer.c: find source selector and
+	option menu in libedataserverui
+
+	* importers/evolution-ldif-importer.c: ditto
+
+	* gui/widgets/eab-popup.c: ditto
+
+	* gui/widgets/eab-gui-util.c: ditto
+
+	* gui/contact-list-editor/e-contact-list-editor.c: ditto
+
+	* gui/contact-editor/e-contact-editor.c: ditto
+
+	* gui/component/select-names/e-select-names.h: ditto
+
+	* gui/component/autocompletion-config.c: ditto
+
+	* gui/component/addressbook-view.c: ditto
+
 2004-10-11  Hans Petter Jansson  <hpj@ximian.com>
 
 	* gui/component/addressbook-view.c (source_list_changed_cb): Don't
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 0a51af0c43..bd5b3b3c1e 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -37,11 +37,12 @@
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <gal/util/e-util.h>
+#include <libedataserverui/e-source-selector.h>
 
 #include "widgets/misc/e-error.h"
 #include "widgets/misc/e-task-bar.h"
 #include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-source-selector.h"
+
 
 #include "e-util/e-passwords.h"
 #include "e-util/e-icon-factory.h"
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 2258f3398b..8161c71166 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -31,8 +31,8 @@
 
 #include <bonobo/bonobo-exception.h>
 
-#include "e-source-selector.h"
 #include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-source-selector.h>
 #include <libgnome/gnome-i18n.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktreeselection.h>
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index e927932d13..664735f74a 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -27,7 +27,7 @@
 #include <gal/e-table/e-table.h>
 #include <gal/e-table/e-table-scrolled.h>
 #include <libedataserver/e-source-list.h>
-#include <widgets/misc/e-source-option-menu.h>
+#include <libedataserverui/e-source-option-menu.h>
 
 #include "e-addressbook-model.h"
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e3731cfbc6..c21e78c6a2 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -45,6 +45,7 @@
 #include <gal/e-text/e-entry.h>
 
 #include <libebook/e-address-western.h>
+#include <libedataserverui/e-source-option-menu.h>
 
 #include <e-util/e-categories-master-list-wombat.h>
 
@@ -59,7 +60,6 @@
 #include "widgets/misc/e-dateedit.h"
 #include "widgets/misc/e-image-chooser.h"
 #include "widgets/misc/e-url-entry.h"
-#include "widgets/misc/e-source-option-menu.h"
 #include "shell/evolution-shell-component-utils.h"
 #include "e-util/e-icon-factory.h"
 
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 ec91ff612e..07b6598b08 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -31,6 +31,8 @@
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkdialog.h>
 
+#include <libedataserverui/e-source-option-menu.h>
+
 #include <gal/e-table/e-table-scrolled.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 
@@ -41,7 +43,6 @@
 #include "shell/evolution-shell-component-utils.h"
 
 #include "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-source-option-menu.h"
 
 #include "addressbook/gui/component/addressbook.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 7cd9c3521d..a1715c86fd 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -26,13 +26,13 @@
 #include <errno.h>
 #include <string.h>
 
+#include <libedataserverui/e-source-selector.h>
 #include <gal/util/e-util.h>
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
 #include "util/e-destination.h"
 #include "widgets/misc/e-error.h"
 #include "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-source-selector.h"
 #include <e-util/e-icon-factory.h>
 
 #include <gnome.h>
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 92624cb4cd..79e9c2a57a 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 
 #include "eab-popup.h"
-#include "widgets/misc/e-source-selector.h"
+#include <libedataserverui/e-source-selector.h>
 #include <libebook/e-contact.h>
 
 static GObjectClass *eabp_parent;
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 31bf39e7f6..080458dbf9 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -28,10 +28,10 @@
 #include <bonobo/bonobo-control.h>
 
 #include <libebook/e-book.h>
+#include <libedataserverui/e-source-selector.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
-#include <widgets/misc/e-source-selector.h>
 #include <util/e-destination.h>
 
 #define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory:" BASE_VERSION
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index 985f06be9e..2f4c293aab 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -41,10 +41,10 @@
 #include <bonobo/bonobo-control.h>
 
 #include <libebook/e-book.h>
+#include <libedataserverui/e-source-selector.h>
 
 #include <importer/evolution-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>
-#include <widgets/misc/e-source-selector.h>
 #include <util/eab-book-util.h>
 #include <util/e-destination.h>