X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-address-book.c;h=9f11f09c04ddac459f0c2cc1063c843bc07c80a4;hp=81fec6c5ef553681ac27fd2ebef9b2cb6e7b673d;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=ee90436b66ba226cfc7d2088094b52ae496d5187

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 81fec6c..9f11f09 100644
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -56,7 +56,6 @@ static EBook *book = NULL;
 static EBookView * book_view = NULL;
 
 static GSList *get_recipients_for_given_contact (EContact * contact, gboolean *canceled);
-static void commit_contact(EContact * contact, gboolean is_new);
 static gchar *get_email_addr_from_user(const gchar * given_name, gboolean *canceled);
 static gchar *ui_get_formatted_email_id(gchar * current_given_name,
 					gchar * current_sur_name, gchar * current_email_id);
@@ -65,139 +64,43 @@ static GSList *select_email_addrs_for_contact(GList * email_addr_list);
 static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, GSList **contact_id, gboolean *canceled);
 static gchar *unquote_string (const gchar *str);
 
-
-static void
-unref_gobject (GObject *obj)
-{
-	if (obj)
-		g_object_unref (obj);
-}
-	
-
-static void
-get_book_view_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data)
-{
-	if (status != E_BOOK_ERROR_OK) {
-		g_object_unref (book);
-		book = NULL;
-		return;
-	}
-	book_view = bookview;
-
-	if (contact_model)
-#if MODEST_ABOOK_API < 4
-		osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model),
-						     book_view);
-#else /* MODEST_ABOOK_API < 4 */
-		osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model),
-						     book_view);
-#endif /* MODEST_ABOOK_API < 4 */
-
-	e_book_view_start (book_view);
-}
-
-static void
-book_open_cb (EBook *view, EBookStatus status, gpointer data)
-{
-	EBookQuery *query = NULL;
-
-	if (status != E_BOOK_ERROR_OK) {
-		g_object_unref (book);
-		book = NULL;
-		return;
-	}
-	query = e_book_query_any_field_contains ("");
-	e_book_async_get_book_view (book, query, NULL, -1, get_book_view_cb, NULL);
-	e_book_query_unref (query);
-}
-
-static gboolean 
+static gboolean
 open_addressbook ()
 {
-	book = e_book_new_system_addressbook (NULL);
-	if (!book)
-		return FALSE;
+	OssoABookRoster *roster;
+	GError *error = NULL;
+	time_t init,end;
 
-	if (e_book_async_open (book, FALSE, book_open_cb, NULL) != E_BOOK_ERROR_OK)
-		return FALSE;
+	if (book && book_view)
+		return TRUE;
 
-	return TRUE; /* FIXME */	
-}
-
-typedef struct _OpenAddressbookSyncInfo {
-	gboolean retval;
-	GMainLoop *mainloop;
-} OpenAddressbookSyncInfo;
+	roster = osso_abook_aggregator_get_default (&error);
+	if (error)
+		goto error;
 
-static void
-get_book_view_sync_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data)
-{
-	OpenAddressbookSyncInfo *info = (OpenAddressbookSyncInfo *) data;
+	/* Wait until it's ready */
+	init = time (NULL);
+	osso_abook_waitable_run ((OssoABookWaitable *) roster,
+				 g_main_context_default (),
+				 &error);
+	end = time (NULL);
+	g_debug ("Opening addressbook lasted %ld seconds", (gint) end-init);
 
-	if (status != E_BOOK_ERROR_OK) {
-		g_object_unref (book);
-		book = NULL;
-		info->retval = FALSE;
-		g_main_loop_quit (info->mainloop);
-		return;
-	}
-	book_view = bookview;
-
-	if (contact_model)
-#if MODEST_ABOOK_API < 4
-		osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model),
-						     book_view);
-#else /* MODEST_ABOOK_API < 4 */
-		osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model),
-						     book_view);
-#endif /* MODEST_ABOOK_API < 4 */
-
-	e_book_view_start (book_view);
-	info->retval = TRUE;
-	g_main_loop_quit (info->mainloop);
-}
-
-static void
-book_open_sync_cb (EBook *view, EBookStatus status, gpointer data)
-{
-	EBookQuery *query = NULL;
-	OpenAddressbookSyncInfo *info = (OpenAddressbookSyncInfo *) data;
-
-	if (status != E_BOOK_ERROR_OK) {
-		g_object_unref (book);
-		book = NULL;
-		info->retval = FALSE;
-		g_main_loop_quit (info->mainloop);
-		return;
-	}
-	query = e_book_query_any_field_contains ("");
-	e_book_async_get_book_view (book, query, NULL, -1, get_book_view_sync_cb, info);
-	e_book_query_unref (query);
-}
+	if (error)
+		goto error;
 
-static gboolean
-open_addressbook_sync ()
-{
-	OpenAddressbookSyncInfo *info;
-	gboolean retval;
+	if (!osso_abook_waitable_is_ready ((OssoABookWaitable *) roster,
+					   &error))
+		goto error;
 
-	book = e_book_new_system_addressbook (NULL);
-	if (!book)
-		return FALSE;
+	book = osso_abook_roster_get_book (roster);
+	book_view = osso_abook_roster_get_book_view (roster);
 
-	info = g_slice_new (OpenAddressbookSyncInfo);
-	info->mainloop = g_main_loop_new (NULL, FALSE);
-	info->retval = FALSE;
-	if (e_book_async_open (book, FALSE, book_open_sync_cb, info) == E_BOOK_ERROR_OK) {
-		GDK_THREADS_LEAVE ();
-		g_main_loop_run (info->mainloop);
-		GDK_THREADS_ENTER ();
-	}
-	retval = info->retval;
-	g_main_loop_unref (info->mainloop);
-	g_slice_free (OpenAddressbookSyncInfo, info);
-	/* Make it launch a main loop */
-	return e_book_open (book, FALSE, NULL);
+	return TRUE;
+ error:
+	g_warning ("error opening addressbook %s", error->message);
+	g_error_free (error);
+	return FALSE;
 }
 
 void
@@ -226,16 +129,10 @@ modest_address_book_add_address (const gchar *address)
 }
 
 void
-modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
+modest_address_book_select_addresses (ModestRecptEditor *recpt_editor,
+				      GtkWindow *parent_window)
 {
-#if MODEST_ABOOK_API < 4
-	GtkWidget *contact_view = NULL;
-	GtkWidget *contact_dialog;
-	GtkWidget *toplevel;
-#else /* MODEST_ABOOK_API < 4 */
 	GtkWidget *contact_chooser = NULL;
-#endif /* MODEST_ABOOK_API < 4 */
-
 	GList *contacts_list = NULL;
 	GSList *email_addrs_per_contact = NULL;
 	gchar *econtact_id;
@@ -243,33 +140,8 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 
 	g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
 
-#if MODEST_ABOOK_API < 4
-	if (!open_addressbook ()) {
-		if (contact_model) {
-			g_object_unref (contact_model);
-			contact_model = NULL;
-		}
-		return;
-	}
-	contact_model = osso_abook_contact_model_new ();
-
-	contact_view = osso_abook_contact_selector_new_basic (contact_model);
-	osso_abook_contact_selector_set_minimum_selection (OSSO_ABOOK_CONTACT_SELECTOR (contact_view), 1);
-
-	contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
-	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog), GTK_WINDOW (toplevel));
-
-	gtk_widget_show (contact_dialog);
-
-	if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
-		contacts_list = 
-			osso_abook_contact_selector_get_extended_selection (OSSO_ABOOK_CONTACT_SELECTOR
-									     (contact_view));
-	}
-#else /* MODEST_ABOOK_API < 4 */
 	/* TODO: figure out how to make the contact chooser modal */
-	contact_chooser = osso_abook_contact_chooser_new_with_capabilities (NULL,
+	contact_chooser = osso_abook_contact_chooser_new_with_capabilities (parent_window,
 									    _AB("addr_ti_dia_select_contacts"),
 									    OSSO_ABOOK_CAPS_EMAIL, 
 									    OSSO_ABOOK_CONTACT_ORDER_NAME);
@@ -280,7 +152,6 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 	if (gtk_dialog_run (GTK_DIALOG (contact_chooser)) == GTK_RESPONSE_OK)
 		contacts_list = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_chooser));
 	gtk_widget_destroy (contact_chooser);
-#endif
 
 	if (contacts_list) {
 		GList *node;
@@ -303,15 +174,6 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 		g_list_free (contacts_list);
 	}
 
-#if MODEST_ABOOK_API < 4
-	if (contact_model) {
-		g_object_unref (contact_model);
-		contact_model = NULL;
-	}
-
-	gtk_widget_destroy (contact_dialog);
-#endif
-
 	if (focus_recpt_editor)
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (recpt_editor));
 
@@ -370,23 +232,17 @@ get_recipients_for_given_contact (EContact * contact,
 
 	/*Launch the 'Add e-mail addr to contact' dialog if required */
 	if (email_not_present) {
-#if MODEST_ABOOK_API < 4
-		display_name = osso_abook_contact_get_display_name(contact);
-#else
 		OssoABookContact *abook_contact;
 
 		abook_contact = osso_abook_contact_new_from_template (contact);
 		display_name = osso_abook_contact_get_display_name(abook_contact);
-#endif
 
 		emailid = get_email_addr_from_user(display_name, canceled);
 		if (emailid) {
-			e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
-			commit_contact(contact, FALSE);
+			e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL_1, emailid);
+			osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
 		}
-#if MODEST_ABOOK_API >= 4
 		g_object_unref (abook_contact);
-#endif
 	}
 
 	if (emailid) {
@@ -425,35 +281,6 @@ get_recipients_for_given_contact (EContact * contact,
 }
 
 /**
- * This is a helper function to commit a EContact to Address_Book application.
- *
- * @param  contact  Contact of type #EContact
- * @return void
- */
-static void 
-commit_contact(EContact * contact, gboolean is_new)
-{
-	g_return_if_fail (contact);
-	g_return_if_fail (book);
-
-	if (!contact || !book)
-		return;
-
-#if MODEST_ABOOK_API < 4
-	osso_abook_contact_commit(contact, is_new, book);
-#else
-	if (OSSO_ABOOK_IS_CONTACT (contact)) {
-		osso_abook_contact_commit(OSSO_ABOOK_CONTACT(contact), is_new, book, NULL);
-	} else {
-		if (is_new)
-			e_book_add_contact (book, contact, NULL);
-		else
-			e_book_commit_contact (book, contact, NULL);
-	}
-#endif /* MODEST_ABOOK_API < 2 */
-}
-
-/**
  * This is a helper function used to launch 'Add e-mail address to contact' dialog
  * after showing appropriate notification, when there is no e-mail address defined
  * for a selected contact.
@@ -647,7 +474,7 @@ select_email_addrs_for_contact(GList * email_addr_list)
 	hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (select_email_addr_dlg),
 					   HILDON_TOUCH_SELECTOR (selector));
 	gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), MODEST_DIALOG_WINDOW_MAX_HEIGHT, -1);
-	
+
 	gtk_widget_show_all(select_email_addr_dlg);
 	result = gtk_dialog_run(GTK_DIALOG(select_email_addr_dlg));
 
@@ -656,73 +483,174 @@ select_email_addrs_for_contact(GList * email_addr_list)
 
 		current_text = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector));
 		selected_email_addr_list = g_slist_append (selected_email_addr_list, current_text);
-		
 	}
 
 	gtk_widget_destroy(select_email_addr_dlg);
 	return selected_email_addr_list;
 }
 
+/* Assumes that the second argument (the user provided one) is a pure
+   email address without name */
+static gint
+compare_addresses (const gchar *address1,
+		   const gchar *mail2)
+{
+	gint retval;
+	gchar *mail1;
+
+	mail1 = modest_text_utils_get_email_address (address1);
+	retval = g_strcmp0 (mail1, mail2);
+	g_free (mail1);
+
+	return retval;
+}
 
-static gboolean /* make this public? */
-add_to_address_book (const gchar* address)
+static EContact *
+get_contact_for_address (GList *contacts,
+			 const gchar *address)
 {
-	EBookQuery *query;
-	GList *contacts = NULL;
-	GError *err = NULL;
+	EContact *retval = NULL, *contact;
+	GList *iter;
 	gchar *email;
-	
-	g_return_val_if_fail (address, FALSE);
-	
-	if (!book) {
-		if (!open_addressbook ()) {
-			g_return_val_if_reached (FALSE);
+
+	email = modest_text_utils_get_email_address (address);
+	iter = contacts;
+	while (iter && !retval) {
+		GList *emails = NULL;
+
+		contact = E_CONTACT (iter->data);
+		emails = e_contact_get (contact, E_CONTACT_EMAIL);
+		if (emails) {
+			/* Look for the email address */
+			if (g_list_find_custom (emails, email, (GCompareFunc) compare_addresses))
+				retval = contact;
+
+			/* Free the list */
+			g_list_foreach (emails, (GFunc) g_free, NULL);
+			g_list_free (emails);
 		}
+		iter = g_list_next (iter);
 	}
-	
-	g_return_val_if_fail (book, FALSE);
+	g_free (email);
 
-	email = modest_text_utils_get_email_address (address);
-	
-	query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, email);
-	if (!e_book_get_contacts (book, query, &contacts, &err)) {
-		g_printerr ("modest: failed to get contacts: %s",
-			    err ? err->message : "<unknown>");
-		if (err)
-			g_error_free (err);
-		return FALSE;
+	return retval;
+}
+
+static void
+async_get_contacts_cb (EBook *book,
+		       EBookStatus status,
+		       GList *contacts,
+		       gpointer closure)
+{
+	GSList *addresses, *iter;
+	GList *to_commit_contacts, *to_add_contacts;
+	EContact *self_contact;
+
+	addresses = (GSList *) closure;
+
+	/* Check errors */
+	if (status != E_BOOK_ERROR_OK)
+		goto frees;
+
+	self_contact = (EContact *) osso_abook_self_contact_get_default ();
+	if (self_contact) {
+		contacts = g_list_prepend (contacts, self_contact);
 	}
-	e_book_query_unref (query);
-	
-	/*  we need to 'commit' it, even if we already found the email
-	 * address in the addressbook; thus, it will show up in the 'recent list' */
-	if (contacts)  {		
-		g_debug ("%s already in the address book", address);
-		commit_contact ((EContact*)contacts->data, FALSE);
-		
-		g_list_foreach (contacts, (GFunc)unref_gobject, NULL);
-		g_list_free (contacts);
 
-	} else {
-		/* it's not yet in the addressbook, add it now! */
-		EContact *new_contact = e_contact_new ();
-		gchar *display_address;
-		display_address = g_strdup (address);
-		if (display_address) {
-			modest_text_utils_get_display_address (display_address);
-			if ((display_address[0] != '\0') && (strlen (display_address) != strlen (address)))
-				e_contact_set (new_contact, E_CONTACT_FULL_NAME, (const gpointer)display_address);
+	iter = addresses;
+	to_commit_contacts = NULL;
+	to_add_contacts = NULL;
+	while (iter) {
+		EContact *contact;
+		const gchar *address;
+
+		/* Look for a contact with such address. We perform
+		   this kind of search because we assume that users
+		   don't usually send emails to tons of addresses */
+		address = (const gchar *) iter->data;
+		contact = get_contact_for_address (contacts, address);
+
+		/* Add new or commit existing contact */
+		if (contact) {
+			to_commit_contacts = g_list_prepend (to_commit_contacts, contact);
+			g_debug ("----Preparing to commit contact %s", address);
+		} else {
+			gchar *email_address, *display_address;
+
+			/* Create new contact and add it to the list */
+			contact = e_contact_new ();
+			email_address = modest_text_utils_get_email_address (address);
+			e_contact_set (contact, E_CONTACT_EMAIL_1, email_address);
+			g_free (email_address);
+
+			display_address = g_strdup (address);
+			if (display_address) {
+				modest_text_utils_get_display_address (display_address);
+				if ((display_address[0] != '\0') && (strlen (display_address) != strlen (address)))
+					e_contact_set (contact, E_CONTACT_FULL_NAME, (const gpointer)display_address);
+				g_free (display_address);
+			}
+
+			to_add_contacts = g_list_prepend (to_add_contacts, contact);
+			g_debug ("----Preparing to add contact %s", address);
 		}
-		e_contact_set (new_contact, E_CONTACT_EMAIL_1, (const gpointer)email);
-		g_free (display_address);
-		commit_contact (new_contact, TRUE);
-		g_debug ("%s added to address book", address);
-		g_object_unref (new_contact);
+
+		iter = g_slist_next (iter);
 	}
 
-	g_free (email);
+	/* Asynchronously add contacts */
+	if (to_add_contacts)
+		e_book_async_add_contacts (book, to_add_contacts, NULL, NULL);
 
-	return TRUE;
+	/* Asynchronously commit contacts */
+	if (to_commit_contacts)
+		e_book_async_commit_contacts (book, to_commit_contacts, NULL, NULL);
+
+	/* Free lists */
+	g_list_free (to_add_contacts);
+	g_list_free (to_commit_contacts);
+
+ frees:
+	if (addresses) {
+		g_slist_foreach (addresses, (GFunc) g_free, NULL);
+		g_slist_free (addresses);
+	}
+	if (contacts)
+		g_list_free (contacts);
+}
+
+
+static void
+add_to_address_book (GSList *addresses)
+{
+	EBookQuery **queries, *composite_query;
+	gint num_add, i;
+
+	g_return_if_fail (addresses);
+
+	if (!book)
+		if (!open_addressbook ())
+			g_return_if_reached ();
+
+	/* Create the list of queries */
+	num_add = g_slist_length (addresses);
+	queries = g_malloc0 (sizeof (EBookQuery *) * num_add);
+	for (i = 0; i < num_add; i++) {
+		gchar *email;
+
+		email = modest_text_utils_get_email_address (g_slist_nth_data (addresses, i));
+		queries[i] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, email);
+		g_free (email);
+	}
+
+	/* Create the query */
+	composite_query = e_book_query_or (num_add, queries, TRUE);
+
+	/* Asynchronously retrieve contacts */
+	e_book_async_get_contacts (book, composite_query, async_get_contacts_cb, addresses);
+
+	/* Frees. This will unref the subqueries as well */
+	e_book_query_unref (composite_query);
 }
 
 typedef struct _CheckNamesInfo {
@@ -820,7 +748,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 {
 	const gchar *recipients = NULL;
 	GSList *start_indexes = NULL, *end_indexes = NULL;
-	GSList *current_start, *current_end;
+	GSList *current_start, *current_end, *to_commit_addresses;
 	gboolean result = TRUE;
 	GtkTextBuffer *buffer;
 	gint offset_delta = 0;
@@ -845,6 +773,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 	current_start = start_indexes;
 	current_end = end_indexes;
 	buffer = modest_recpt_editor_get_buffer (recpt_editor);
+	to_commit_addresses = NULL;
 
 	while (current_start != NULL) {
 		gchar *address;
@@ -899,12 +828,20 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 					new_length = g_utf8_strlen (recipients, -1);
 					offset_delta = offset_delta + new_length - last_length;
 					last_length = new_length;
-				} else if (canceled) {
-					/* We have to remove the recipient if not resolved */
-					modest_recpt_editor_replace_with_resolved_recipient (recpt_editor,
-											     &start_iter, &end_iter,
-											     NULL,
-											     NULL);
+				} else {
+					if (canceled) {
+						/* We have to remove the recipient if not resolved */
+						modest_recpt_editor_replace_with_resolved_recipient (recpt_editor,
+												     &start_iter, 
+												     &end_iter,
+												     NULL,
+												     NULL);
+					} else {
+						/* There is no contact with that name so it's not
+						   valid. Don't show any error because it'll be done
+						   later */
+						result = FALSE;
+					}
 				}
 			} else {
 				/* this address is not valid, select it and return control to user showing banner */
@@ -941,9 +878,10 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 		/* note: adding it the to the addressbook if it did not exist yet,
 		 * and adding it to the recent_list */
 		if (result && update_addressbook && store_address)
-			add_to_address_book (address);
+			to_commit_addresses = g_slist_prepend (to_commit_addresses, address);
+		else
+			g_free (address);
 
-		g_free (address);
 		if (result == FALSE)
 			break;
 
@@ -951,6 +889,10 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 		current_end = g_slist_next (current_end);
 	}
 
+	/* Add addresses to address-book */
+	if (to_commit_addresses)
+		add_to_address_book (to_commit_addresses);
+
 	if (current_start == NULL) {
 		gtk_text_buffer_get_end_iter (buffer, &end_iter);
 		gtk_text_buffer_place_cursor (buffer, &end_iter);
@@ -1016,58 +958,49 @@ get_contacts_for_name (const gchar *name)
 	return result;
 }
 
+static gboolean
+filter_by_name (OssoABookContactChooser *chooser,
+		OssoABookContact        *contact,
+		gpointer                 user_data)
+{
+	const gchar *contact_name;
+	const gchar *name = (const gchar *) user_data;
+
+	contact_name = osso_abook_contact_get_name (contact);
+	/* contact_name includes both name and surname */
+	if (contact_name && name && strstr (contact_name, name))
+		return TRUE;
+	else
+		return FALSE;
+}
+
 static GList *
 select_contacts_for_name_dialog (const gchar *name)
 {
-	EBookQuery *full_name_book_query = NULL;
-	EBookView *book_view = NULL;
+	GtkWidget *contact_view;
+	OssoABookContactChooser *contact_dialog;
 	GList *result = NULL;
 	gchar *unquoted;
 
-	unquoted = unquote_string (name);
-	full_name_book_query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_CONTAINS, unquoted);
-	g_free (unquoted);
-	e_book_get_book_view (book, full_name_book_query, NULL, -1, &book_view, NULL);
-	e_book_query_unref (full_name_book_query);
+	contact_dialog = (OssoABookContactChooser *)
+		osso_abook_contact_chooser_new_with_capabilities (NULL,
+								  _AB("addr_ti_dia_select_contacts"),
+								  OSSO_ABOOK_CAPS_EMAIL,
+								  OSSO_ABOOK_CONTACT_ORDER_NAME);
 
-	if (book_view) {
-		GtkWidget *contact_dialog = NULL;
-#if MODEST_ABOOK_API < 4
-		GtkWidget *contact_view = NULL;
-		osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model), book_view);
-		e_book_view_start (book_view);
+	/* Enable multiselection */
+	osso_abook_contact_chooser_set_maximum_selection (contact_dialog, G_MAXUINT);
 
-		contact_view = osso_abook_contact_selector_new_basic (contact_model);
-		contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
+	/* Set up the filtering */
+	unquoted = unquote_string (name);
+	contact_view = osso_abook_contact_chooser_get_contact_view (contact_dialog);
+	osso_abook_contact_chooser_set_model (contact_dialog, contact_model);
+	osso_abook_contact_chooser_set_visible_func (contact_dialog, filter_by_name, unquoted, NULL);
 
-		if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
-			result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view));
-		}
-		e_book_view_stop (book_view);
-		g_object_unref (book_view);
-		gtk_widget_destroy (contact_dialog);
-#else /* MODEST_ABOOK_API < 4 */
-		osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model), book_view);
-		e_book_view_start (book_view);
-
-		/* TODO: figure out how to make the contact chooser modal */
-		contact_dialog = osso_abook_contact_chooser_new_with_capabilities (NULL,
-										   _AB("addr_ti_dia_select_contacts"),
-										   OSSO_ABOOK_CAPS_EMAIL,
-										   OSSO_ABOOK_CONTACT_ORDER_NAME);
-		/* Enable multiselection */
-		osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
-								  G_MAXUINT);
-		osso_abook_contact_chooser_set_model (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
-						      contact_model);
-
-		if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
-			result = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog));
-		e_book_view_stop (book_view);
-		g_object_unref (book_view);
-		gtk_widget_destroy (contact_dialog);
-#endif /* MODEST_ABOOK_API < 4 */
-	}
+	if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
+		result = osso_abook_contact_chooser_get_selection (contact_dialog);
+
+	g_free (unquoted);
 
 	return result;
 }
@@ -1088,9 +1021,9 @@ resolve_address (const gchar *address,
 	*canceled = FALSE;
 	info = g_slice_new0 (CheckNamesInfo);
 	show_check_names_banner (info);
-	
-	contact_model = osso_abook_contact_model_new ();
-	if (!open_addressbook_sync ()) {
+
+	contact_model = osso_abook_contact_model_get_default ();
+	if (!open_addressbook ()) {
 		hide_check_names_banner (info);
 		if (contact_model) {
 			g_object_unref (contact_model);
@@ -1099,9 +1032,9 @@ resolve_address (const gchar *address,
 		clean_check_names_banner (info);
 		return FALSE;
 	}
-	hide_check_names_banner (info);
 
 	resolved_contacts = get_contacts_for_name (address);
+	hide_check_names_banner (info);
 
 	if (resolved_contacts == NULL) {
 		/* no matching contacts for the search string */
@@ -1136,7 +1069,6 @@ resolve_address (const gchar *address,
 			}
 		}
 
-		g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL);
 		g_list_free (resolved_contacts);
 		clean_check_names_banner (info);
 
@@ -1184,41 +1116,58 @@ unquote_string (const gchar *str)
 gboolean
 modest_address_book_has_address (const gchar *address)
 {
-	EBookQuery *query;
 	GList *contacts = NULL;
 	GError *err = NULL;
 	gchar *email;
 	gboolean result;
+	OssoABookAggregator *roster;
 
 	g_return_val_if_fail (address, FALSE);
-	
+
 	if (!book) {
 		if (!open_addressbook ()) {
 			g_return_val_if_reached (FALSE);
 		}
 	}
-	
 	g_return_val_if_fail (book, FALSE);
 
 	email = modest_text_utils_get_email_address (address);
-	
-	query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, email);
-	if (!e_book_get_contacts (book, query, &contacts, &err)) {
-		g_printerr ("modest: failed to get contacts: %s",
-			    err ? err->message : "<unknown>");
+
+	roster = (OssoABookAggregator *) osso_abook_aggregator_get_default (NULL);
+	contacts = osso_abook_aggregator_find_contacts_for_email_address (roster, email);
+	if (!contacts) {
 		if (err)
 			g_error_free (err);
+		g_free (email);
 		return FALSE;
 	}
-	e_book_query_unref (query);
 
-	result = (contacts != NULL);
 	if (contacts) {
-		g_list_foreach (contacts, (GFunc)unref_gobject, NULL);
 		g_list_free (contacts);
+		result = TRUE;
 	}
-	
+
 	g_free (email);
 
 	return result;
 }
+
+const gchar *
+modest_address_book_get_my_name ()
+{
+	OssoABookSelfContact *self_contact = osso_abook_self_contact_get_default ();
+
+	/* We are not using osso_abook_contact_get_display_name
+	   because that method fallbacks to another fields if the name
+	   is not defined */
+	if (self_contact)
+		return e_contact_get ((EContact *) self_contact, E_CONTACT_FULL_NAME);
+	else
+		return NULL;
+}
+
+void
+modest_address_book_init (void)
+{
+	open_addressbook ();
+}