diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-06-18 06:00:00 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-06-18 06:00:00 +0800 |
| commit | b7ed99720d5156cf384ade2d970e2178f672a8d5 (patch) | |
| tree | 028338415b64a2069f0bce1838ac2d141565a387 /addressbook/gui/component | |
| parent | b5c3d6571fd0354a36984f85aa159f377d3f8c74 (diff) | |
| download | gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.gz gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.zst gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.zip | |
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
Diffstat (limited to 'addressbook/gui/component')
7 files changed, 6 insertions, 8 deletions
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 859b71103f..39ff162457 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -30,7 +30,7 @@ #include "addressbook-migrate.h" #include "e-destination.h" -#include <libebook/e-book-async.h> +#include <libebook/e-book.h> #include <libgnome/gnome-i18n.h> #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index a86c094dcc..b053053048 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -61,8 +61,6 @@ #include "addressbook/printing/e-contact-print.h" #include "addressbook/util/eab-book-util.h" -#include <libebook/e-book-async.h> - #define PARENT_TYPE G_TYPE_OBJECT static GObjectClass *parent_class = NULL; diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 7d67863ab9..ec113b9578 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -26,7 +26,7 @@ #include <gtk/gtkmessagedialog.h> #include <libgnome/gnome-i18n.h> -#include <libebook/e-book-async.h> +#include <libebook/e-book.h> #include "e-util/e-passwords.h" diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h index d0ab99b62e..a2a475951a 100644 --- a/addressbook/gui/component/addressbook.h +++ b/addressbook/gui/component/addressbook.h @@ -5,7 +5,7 @@ #include <e-util/e-config-listener.h> #include <bonobo/bonobo-object.h> #include <bonobo/bonobo-moniker-util.h> -#include <libebook/e-book-async.h> +#include <libebook/e-book.h> guint addressbook_load (EBook *book, EBookCallback cb, gpointer closure); void addressbook_load_cancel (guint id); 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> |