From b7ed99720d5156cf384ade2d970e2178f672a8d5 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 17 Jun 2004 22:00:00 +0000 Subject: EBookContactsCallback -> EBookListCallback. (eab_nickname_query): same. 2004-06-17 Chris Toshok * 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/util/eab-book-util.c | 4 ++-- addressbook/util/eab-book-util.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'addressbook/util') diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index 7482ad2807..53a09c323b 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -74,7 +74,7 @@ guint eab_name_and_email_query (EBook *book, const gchar *name, const gchar *email, - EBookContactsCallback cb, + EBookListCallback cb, gpointer closure) { gchar *email_query=NULL, *name_query=NULL; @@ -153,7 +153,7 @@ eab_name_and_email_query (EBook *book, guint eab_nickname_query (EBook *book, const char *nickname, - EBookContactsCallback cb, + EBookListCallback cb, gpointer closure) { EBookQuery *query; diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h index 7fda98adf3..ae3a45ef35 100644 --- a/addressbook/util/eab-book-util.h +++ b/addressbook/util/eab-book-util.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "e-util/e-config-listener.h" G_BEGIN_DECLS @@ -44,11 +44,11 @@ EConfigListener *eab_get_config_database (void); guint eab_name_and_email_query (EBook *book, const char *name, const char *email, - EBookContactsCallback cb, + EBookListCallback cb, gpointer closure); guint eab_nickname_query (EBook *book, const char *nickname, - EBookContactsCallback cb, + EBookListCallback cb, gpointer closure); GList *eab_contact_list_from_string (const char *str); -- cgit v1.2.3