aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2004-06-18 06:00:00 +0800
committerChris Toshok <toshok@src.gnome.org>2004-06-18 06:00:00 +0800
commitb7ed99720d5156cf384ade2d970e2178f672a8d5 (patch)
tree028338415b64a2069f0bce1838ac2d141565a387 /addressbook
parentb5c3d6571fd0354a36984f85aa159f377d3f8c74 (diff)
downloadgsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar
gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.gz
gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.bz2
gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.lz
gsoc2013-evolution-b7ed99720d5156cf384ade2d970e2178f672a8d5.tar.xz
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')
-rw-r--r--addressbook/ChangeLog44
-rw-r--r--addressbook/gui/component/addressbook-migrate.c2
-rw-r--r--addressbook/gui/component/addressbook-view.c2
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--addressbook/gui/component/addressbook.h2
-rw-r--r--addressbook/gui/component/select-names/e-select-names-completion.h2
-rw-r--r--addressbook/gui/component/select-names/e-select-names-model.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.h2
-rw-r--r--addressbook/gui/contact-editor/eab-editor.h2
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.h2
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-model.h1
-rw-r--r--addressbook/gui/merging/eab-contact-merging.h2
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.h2
-rw-r--r--addressbook/gui/widgets/eab-popup-control.c1
-rw-r--r--addressbook/gui/widgets/eab-popup-control.h2
-rw-r--r--addressbook/gui/widgets/eab-vcard-control.c2
-rw-r--r--addressbook/printing/e-contact-print.c2
-rw-r--r--addressbook/util/eab-book-util.c4
-rw-r--r--addressbook/util/eab-book-util.h6
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 <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.
+
2004-06-17 Sivaiah Nallagatla <snallagatla@novell.com>
* 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 <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>
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 <libebook/e-book-async.h>
+#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include <gtk/gtktreeview.h>
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 <bonobo/bonobo-ui-component.h>
#include <glade/glade.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include <gtk/gtktreeview.h>
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 <libebook/e-book-async.h>
+#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#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 <gal/e-table/e-table-model.h>
-#include <libebook/e-book-async.h>
#include <libebook/e-contact.h>
#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 <libebook/e-book-async.h>
+#include <libebook/e-book.h>
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 <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>
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 <libgnomeprint/gnome-print-job.h>
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprintui/gnome-print-job-preview.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include <gal/util/e-util.h>
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 <bonobo/bonobo-object.h>
#include <bonobo/bonobo-moniker-util.h>
-#include <libebook/e-book-async.h>
+#include <libebook/e-book.h>
#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);