addressbook: Port to use new _async suffix instead of _ex suffix

4 files changed, 27 insertions, 27 deletions

diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c
index 10ec1a5b26..077e629f6e 100644
--- a/addressbook/util/addressbook.c
+++ b/addressbook/util/addressbook.c
@@ -37,11 +37,11 @@
 #define d(x)
 
 static void addressbook_authenticate (EBook *book, gboolean previous_failure,
-				      ESource *source, EBookExCallback cb, gpointer closure);
+				      ESource *source, EBookAsyncCallback cb, gpointer closure);
 static void auth_required_cb (EBook *book, gpointer data);
 
 typedef struct {
-	EBookExCallback cb;
+	EBookAsyncCallback cb;
 	ESource *source;
 	gpointer closure;
 	guint cancelled : 1;
@@ -173,7 +173,7 @@ set_remember_password (ESource *source, gboolean value)
 
 static void
 addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source,
-			  EBookExCallback cb, gpointer closure)
+			  EBookAsyncCallback cb, gpointer closure)
 {
 	const gchar *password = NULL;
 	gchar *pass_dup = NULL;
@@ -236,9 +236,9 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc
 	}
 
 	if (password || pass_dup) {
-		e_book_async_authenticate_user_ex (book, user, password ? password : pass_dup,
-						   e_source_get_property (source, "auth"),
-						   cb, closure);
+		e_book_authenticate_user_async (book, user, password ? password : pass_dup,
+						e_source_get_property (source, "auth"),
+						cb, closure);
 		g_free (pass_dup);
 	}
 	else {
@@ -294,7 +294,7 @@ load_source_cb (EBook *book, const GError *error, gpointer closure)
 
 guint
 addressbook_load (EBook *book,
-		  EBookExCallback cb, gpointer closure)
+		  EBookAsyncCallback cb, gpointer closure)
 {
 	LoadSourceData *load_source_data = g_new0 (LoadSourceData, 1);
 
@@ -303,7 +303,7 @@ addressbook_load (EBook *book,
 	load_source_data->source = g_object_ref (g_object_ref (e_book_get_source (book)));
 	load_source_data->cancelled = FALSE;
 
-	e_book_async_open_ex (book, FALSE, load_source_cb, load_source_data);
+	e_book_open_async (book, FALSE, load_source_cb, load_source_data);
 
 	return GPOINTER_TO_UINT (load_source_data);
 }
@@ -328,7 +328,7 @@ default_book_cb (EBook *book, const GError *error, gpointer closure)
 }
 
 void
-addressbook_load_default_book (EBookExCallback cb, gpointer closure)
+addressbook_load_default_book (EBookAsyncCallback cb, gpointer closure)
 {
 	LoadSourceData *load_source_data = g_new (LoadSourceData, 1);
 	EBook *book;
@@ -344,6 +344,6 @@ addressbook_load_default_book (EBookExCallback cb, gpointer closure)
 		load_source_cb (NULL, error, load_source_data);
 		g_error_free (error);
 	} else
-		e_book_async_open_ex (
+		e_book_open_async (
 			book, FALSE, default_book_cb, load_source_data);
 }
diff --git a/addressbook/util/addressbook.h b/addressbook/util/addressbook.h
index fca409ed8c..84163786d8 100644
--- a/addressbook/util/addressbook.h
+++ b/addressbook/util/addressbook.h
@@ -24,8 +24,8 @@
 
 #include <libebook/e-book.h>
 
-guint      addressbook_load                 (EBook *book, EBookExCallback cb, gpointer closure);
+guint      addressbook_load                 (EBook *book, EBookAsyncCallback cb, gpointer closure);
 void       addressbook_load_cancel          (guint id);
-void       addressbook_load_default_book    (EBookExCallback open_response, gpointer closure);
+void       addressbook_load_default_book    (EBookAsyncCallback open_response, gpointer closure);
 
 #endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index a1827d3cc9..3cd301bd70 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -55,11 +55,11 @@ escape (const gchar *str)
 }
 
 guint
-eab_name_and_email_query (EBook *book,
-			  const gchar *name,
-			  const gchar *email,
-			  EBookListExCallback cb,
-			  gpointer closure)
+eab_name_and_email_query (EBook                  *book,
+			  const gchar            *name,
+			  const gchar            *email,
+			  EBookListAsyncCallback  cb,
+			  gpointer                closure)
 {
 	gchar *email_query=NULL, *name_query=NULL;
 	EBookQuery *query;
@@ -119,7 +119,7 @@ eab_name_and_email_query (EBook *book,
 	else
 		return 0;
 
-	tag = e_book_async_get_contacts_ex (book, query, cb, closure);
+	tag = e_book_get_contacts_async (book, query, cb, closure);
 
 	g_free (email_query);
 	g_free (name_query);
@@ -134,10 +134,10 @@ eab_name_and_email_query (EBook *book,
  * Simple nickname query
  */
 guint
-eab_nickname_query (EBook                 *book,
+eab_nickname_query (EBook                  *book,
 		    const gchar            *nickname,
-		    EBookListExCallback      cb,
-		    gpointer               closure)
+		    EBookListAsyncCallback  cb,
+		    gpointer                closure)
 {
 	EBookQuery *query;
 	gchar *query_string;
@@ -154,7 +154,7 @@ eab_nickname_query (EBook                 *book,
 
 	query = e_book_query_from_string (query_string);
 
-	retval = e_book_async_get_contacts_ex (book, query, cb, closure);
+	retval = e_book_get_contacts_async (book, query, cb, closure);
 
 	g_free (query_string);
 	e_book_query_unref (query);
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
index edc7c3ebe6..1cda93c102 100644
--- a/addressbook/util/eab-book-util.h
+++ b/addressbook/util/eab-book-util.h
@@ -32,13 +32,13 @@ typedef void (*EABHaveAddressCallback) (EBook *book, const gchar *addr, EContact
 
 /* Specialized Name/Email Queries */
 guint                  eab_name_and_email_query      (EBook                    *book,
-						      const gchar               *name,
-						      const gchar               *email,
-						      EBookListExCallback       cb,
+						      const gchar              *name,
+						      const gchar              *email,
+						      EBookListAsyncCallback    cb,
 						      gpointer                  closure);
 guint                  eab_nickname_query            (EBook                    *book,
-						      const gchar               *nickname,
-						      EBookListExCallback       cb,
+						      const gchar              *nickname,
+						      EBookListAsyncCallback     cb,
 						      gpointer                  closure);
 
 GList                 *eab_contact_list_from_string (const gchar *str);