From b7ed99720d5156cf384ade2d970e2178f672a8d5 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Thu, 17 Jun 2004 22:00:00 +0000
Subject: EBookContactsCallback -> EBookListCallback. (eab_nickname_query):
 same.

2004-06-17  Chris Toshok  <toshok@ximian.com>

	* util/eab-book-util.c (eab_name_and_email_query):
	EBookContactsCallback -> EBookListCallback.
	(eab_nickname_query): same.

	* printing/e-contact-print.c: e-book-async.h -> e-book.h

	* gui/widgets/eab-vcard-control.c: e-book-async.h -> e-book.h.

	* gui/widgets/e-addressbook-model.h: e-book-async.h -> e-book.h.

	* gui/widgets/eab-popup-control.h: e-book-async.h -> e-book.h.

	* gui/widgets/eab-popup-control.c: remove e-book-async.h include.

	* gui/merging/eab-contact-merging.h: e-book-async.h -> e-book.h.

	* gui/contact-editor/e-contact-editor.h: e-book-async.h ->
	e-book.h.

	* gui/contact-editor/e-contact-editor.h: same.

	* gui/contact-list-editor/e-contact-list-editor.h: same.

	* gui/contact-list-editor/e-contact-list-model.h: remove include
	of e-book-async.h

	* gui/component/select-names/e-select-names-completion.h: include
	e-book.h, not e-book-async.h

	* gui/component/select-names/e-select-names-model.c: same.

	* gui/component/select-names/e-select-names.c: same.

	* gui/component/addressbook-migrate.c: include e-book.h, not
	e-book-async.h

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

	* gui/component/addressbook.h: same.

	* gui/component/addressbook.c: remove include e-book-async.h.

svn path=/trunk/; revision=26402
---
 addressbook/gui/widgets/e-addressbook-model.h | 2 +-
 addressbook/gui/widgets/eab-popup-control.c   | 1 -
 addressbook/gui/widgets/eab-popup-control.h   | 2 +-
 addressbook/gui/widgets/eab-vcard-control.c   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'addressbook/gui/widgets')

diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index e83477ff93..e5ebb83dab 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
 #include <libebook/e-book-view.h>
 
 #define EAB_TYPE_MODEL                  (eab_model_get_type ())
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index 5afddcd3af..cf2190ea5d 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -48,7 +48,6 @@
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <gal/widgets/e-popup-menu.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 491f63f68e..1f4f22558f 100644
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ b/addressbook/gui/widgets/eab-popup-control.h
@@ -29,7 +29,7 @@
 #define __EAB_POPUP_CONTROL_H__
 
 #include <bonobo/bonobo-event-source.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 
 #include <gtk/gtkeventbox.h>
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
index 7289851113..239abe5e1c 100644
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ b/addressbook/gui/widgets/eab-vcard-control.c
@@ -33,7 +33,7 @@
 #include <bonobo/bonobo-stream-client.h>
 #include <gal/util/e-util.h>
 
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <addressbook/gui/component/addressbook.h>
 #include <addressbook/gui/widgets/eab-contact-display.h>
-- 
cgit v1.2.3