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/component/select-names/e-select-names-completion.h | 2 +-
 addressbook/gui/component/select-names/e-select-names-model.c      | 2 +-
 addressbook/gui/component/select-names/e-select-names.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addressbook/gui/component/select-names')

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 4ad1f4fd52..97a3f3f5ca 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 <libebook/e-book-async.h>
+#include <libebook/e-book.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 60ad924dcd..de5ed4723d 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-model.c
@@ -16,7 +16,7 @@
 #include <gtk/gtksignal.h>
 
 #include <gal/util/e-util.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include "e-select-names-model.h"
 #include "e-select-names-marshal.h"
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 158abd0755..5ea291b32e 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -31,7 +31,7 @@
 #include <gal/e-table/e-table-without.h>
 #include <gal/widgets/e-popup-menu.h>
 
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <addressbook/gui/widgets/e-addressbook-model.h>
 #include <addressbook/gui/widgets/e-addressbook-table-adapter.h>
-- 
cgit v1.2.3