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/ChangeLog | 44 ++++++++++++++++++++++ addressbook/gui/component/addressbook-migrate.c | 2 +- addressbook/gui/component/addressbook-view.c | 2 - addressbook/gui/component/addressbook.c | 2 +- addressbook/gui/component/addressbook.h | 2 +- .../select-names/e-select-names-completion.h | 2 +- .../component/select-names/e-select-names-model.c | 2 +- .../gui/component/select-names/e-select-names.c | 2 +- addressbook/gui/contact-editor/e-contact-editor.h | 2 +- addressbook/gui/contact-editor/eab-editor.h | 2 +- .../contact-list-editor/e-contact-list-editor.h | 2 +- .../gui/contact-list-editor/e-contact-list-model.h | 1 - addressbook/gui/merging/eab-contact-merging.h | 2 +- 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 +- addressbook/printing/e-contact-print.c | 2 +- addressbook/util/eab-book-util.c | 4 +- addressbook/util/eab-book-util.h | 6 +-- 20 files changed, 63 insertions(+), 23 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 06822d0648..9a339c345a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,47 @@ +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. + 2004-06-17 Sivaiah Nallagatla * gui/widgets/e-addressbook-view.etspec : update 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 +#include #include #include #include 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 - #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 #include -#include +#include #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 #include #include -#include +#include 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 -#include +#include #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 #include -#include +#include #include #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 #include -#include +#include #include #include #include diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 925455f0f8..7ab3969e3f 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -27,7 +27,7 @@ #include "addressbook/gui/contact-editor/eab-editor.h" -#include +#include #include #include diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h index e4e90622d2..6c1afccf21 100644 --- a/addressbook/gui/contact-editor/eab-editor.h +++ b/addressbook/gui/contact-editor/eab-editor.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index 9fbda49c5b..eb284b3fa4 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -28,7 +28,7 @@ #include "addressbook/gui/contact-editor/eab-editor.h" -#include +#include #include #include "addressbook/util/e-destination.h" diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h index d00b725eda..0c01dfa7ed 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h @@ -3,7 +3,6 @@ #define _E_CONTACT_LIST_MODEL_H_ #include -#include #include #include "addressbook/util/e-destination.h" diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h index d6d60e57de..80a7717ce8 100644 --- a/addressbook/gui/merging/eab-contact-merging.h +++ b/addressbook/gui/merging/eab-contact-merging.h @@ -12,7 +12,7 @@ #ifndef __E_CONTACT_MERGING_H__ #define __E_CONTACT_MERGING_H__ -#include +#include G_BEGIN_DECLS 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 #include -#include +#include #include #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 #include #include -#include #include #include #include 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 -#include +#include #include #include 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 #include -#include +#include #include #include #include diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 485e427c62..e47f37f0da 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include 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