Added support for external addressbook Nokia service in hildon (com.nokia.asdbus).
[modest] / src / hildon2 / modest-address-book.c
index c22165a..9da5e18 100644 (file)
@@ -38,6 +38,7 @@
 #include <libebook/e-vcard.h>
 #include "modest-hildon-includes.h"
 #include <libosso-abook/osso-abook.h>
+#include <libedataserver/e-data-server-util.h>
 #include "modest-platform.h"
 #include "modest-runtime.h"
 #include "widgets/modest-window-mgr.h"
@@ -50,6 +51,9 @@
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkentry.h>
 #include <modest-maemo-utils.h>
+#ifdef MODEST_PLATFORM_MAEMO
+#include <dbus_api/asdbus.h>
+#endif
 
 static OssoABookContactModel *contact_model =  NULL;
 static EBook *book = NULL;
@@ -63,6 +67,7 @@ static gchar *run_add_email_addr_to_contact_dlg(const gchar * contact_name, gboo
 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 set_contact_from_display_name (EContact *contact, const gchar *display_name);
 
 static gboolean
 open_addressbook ()
@@ -104,7 +109,8 @@ open_addressbook ()
 }
 
 void
-modest_address_book_add_address (const gchar *address)
+modest_address_book_add_address (const gchar *address,
+                                GtkWindow *parent)
 {
        GtkWidget *dialog = NULL;
        gchar *email_address;
@@ -115,10 +121,11 @@ modest_address_book_add_address (const gchar *address)
        }
 
        email_address = modest_text_utils_get_email_address (address);
-       
+
        attribute = e_vcard_attribute_new (NULL, EVC_EMAIL);
        e_vcard_attribute_add_value (attribute, email_address);
-       dialog = osso_abook_temporary_contact_dialog_new (NULL, book, attribute, NULL);
+       dialog = osso_abook_temporary_contact_dialog_new (parent, book, attribute, NULL);
+
        gtk_dialog_run (GTK_DIALOG (dialog));
 
        gtk_widget_destroy (dialog);
@@ -145,6 +152,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor,
                                                                            _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_chooser),
                                                          G_MAXUINT);
@@ -239,7 +247,8 @@ get_recipients_for_given_contact (EContact * contact,
 
                emailid = get_email_addr_from_user(display_name, canceled);
                if (emailid) {
-                       e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL_1, emailid);
+                       list = g_list_append (list, g_strdup (emailid));
+                       e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL, list);
                        osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
                }
                g_object_unref (abook_contact);
@@ -336,10 +345,9 @@ ui_get_formatted_email_id(gchar * current_given_name,
        } else if ((current_sur_name != NULL) && (strlen(current_sur_name) != 0)) {
                g_string_append_printf(email_id_str, "%s", current_sur_name);
        }
-       if (g_utf8_strchr (email_id_str->str, -1, ' ')) {
-               g_string_prepend_c (email_id_str, '\"');
-               g_string_append_c (email_id_str, '\"');
-       }
+       g_string_prepend_c (email_id_str, '\"');
+       g_string_append_c (email_id_str, '\"');
+
        g_string_append_printf (email_id_str, " %c%s%c", '<', current_email_id, '>');
        return g_string_free (email_id_str, FALSE);
 }
@@ -496,11 +504,16 @@ compare_addresses (const gchar *address1,
                   const gchar *mail2)
 {
        gint retval;
-       gchar *mail1;
+       gchar *mail1, *mail1_down, *mail2_down;
 
+       /* Perform a case insensitive comparison */
        mail1 = modest_text_utils_get_email_address (address1);
-       retval = g_strcmp0 (mail1, mail2);
+       mail1_down = g_ascii_strdown (mail1, -1);
+       mail2_down = g_ascii_strdown (mail2, -1);
+       retval = g_strcmp0 (mail1_down, mail2_down);
        g_free (mail1);
+       g_free (mail1_down);
+       g_free (mail2_down);
 
        return retval;
 }
@@ -576,18 +589,21 @@ async_get_contacts_cb (EBook *book,
                        g_debug ("----Preparing to commit contact %s", address);
                } else {
                        gchar *email_address, *display_address;
+                       GList *email_list = NULL;
 
                        /* 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);
+                       email_list = g_list_append (email_list, email_address);
+                       e_contact_set (contact, E_CONTACT_EMAIL, email_list);
                        g_free (email_address);
+                       g_list_free (email_list);
 
                        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);
+                                       set_contact_from_display_name (contact, (const gchar *) display_address);
                                g_free (display_address);
                        }
 
@@ -619,40 +635,6 @@ async_get_contacts_cb (EBook *book,
                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 {
        GtkWidget *banner;
        guint show_banner_timeout;
@@ -744,16 +726,18 @@ void free_resolved_addresses_list (gpointer data,
 }
 
 gboolean
-modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
+modest_address_book_check_names (ModestRecptEditor *recpt_editor,
+                                GSList **address_list)
 {
        const gchar *recipients = NULL;
        GSList *start_indexes = NULL, *end_indexes = NULL;
-       GSList *current_start, *current_end, *to_commit_addresses;
+       GSList *current_start, *current_end;
        gboolean result = TRUE;
        GtkTextBuffer *buffer;
        gint offset_delta = 0;
        gint last_length;
        GtkTextIter start_iter, end_iter;
+       gboolean empty_recipients = 0;
 
        g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
 
@@ -773,22 +757,28 @@ 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;
                gchar *start_ptr, *end_ptr;
                gint start_pos, end_pos;
                const gchar *invalid_char_position = NULL;
-               gboolean store_address = FALSE;
 
                start_pos = (*((gint*) current_start->data)) + offset_delta;
                end_pos = (*((gint*) current_end->data)) + offset_delta;
-              
+
                start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
                end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
 
                address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr));
+
+               /* Ignore empty addresses */
+               if (!g_strcmp0 (address, "")) {
+                       g_free (address);
+                       empty_recipients++;
+                       goto next_address;
+               }
+
                gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start_pos);
                gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end_pos);
                gtk_text_buffer_select_range (buffer, &start_iter, &end_iter);
@@ -862,42 +852,46 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
                        }
                        g_slist_free (tags);
                        if (!has_recipient) {
-                               GSList * address_list = NULL;
+                               GSList * addr_list = NULL;
 
-                               address_list = g_slist_prepend (address_list, address);
+                               addr_list = g_slist_prepend (addr_list, address);
                                modest_recpt_editor_replace_with_resolved_recipient (recpt_editor,
                                                                                     &start_iter, &end_iter,
-                                                                                    address_list, 
+                                                                                    addr_list,
                                                                                     "");
-                               g_slist_free (address_list);
-                               store_address = TRUE;
+                               g_slist_free (addr_list);
                        }
                }
 
                /* so, it seems a valid address */
                /* 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)
-                       to_commit_addresses = g_slist_prepend (to_commit_addresses, address);
+               if (result && address_list)
+                       *address_list = g_slist_prepend (*address_list, address);
                else
                        g_free (address);
 
                if (result == FALSE)
                        break;
 
+       next_address:
                current_start = g_slist_next (current_start);
                current_end = g_slist_next (current_end);
        }
 
-       /* Add addresses to address-book */
-       if (to_commit_addresses)
-               add_to_address_book (to_commit_addresses);
+       /* Remove dup's */
+       if (address_list && *address_list)
+               *address_list = modest_text_utils_remove_duplicate_addresses_list (*address_list);
 
        if (current_start == NULL) {
                gtk_text_buffer_get_end_iter (buffer, &end_iter);
                gtk_text_buffer_place_cursor (buffer, &end_iter);
        }
 
+       /* Check that at least there is one non-empty recipient */
+       if ((g_slist_length (start_indexes) - empty_recipients) == 0)
+               result = FALSE;
+
        g_slist_foreach (start_indexes, (GFunc) g_free, NULL);
        g_slist_foreach (end_indexes, (GFunc) g_free, NULL);
        g_slist_free (start_indexes);
@@ -907,102 +901,189 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 
 }
 
-typedef struct _GetContactsInfo {
-       GMainLoop *mainloop;
-       GList *result;
-} GetContactsInfo;
 
-static void 
-get_contacts_for_name_cb (EBook *book, 
-                         EBookStatus status, 
-                         GList *list, 
-                         gpointer userdata)
+
+static void
+set_contact_from_display_name (EContact *contact, const gchar *disp_name)
 {
-       GetContactsInfo *info = (GetContactsInfo *) userdata;
+       const gchar *parent_open;
+       const gchar *comma_separator;
+       GString *buffer;
+       gchar *display_name;
+
+       display_name = unquote_string (disp_name);
+       buffer = g_string_new ("");
 
-       if (status == E_BOOK_ERROR_OK)
-               info->result = list;
+       /* First we remove part in () */
+       parent_open = g_strstr_len (display_name, -1, "(");
+       if (parent_open) {
+               const gchar *parent_close;
 
-       g_main_loop_quit (info->mainloop);
+               parent_close = g_strstr_len (parent_open, -1, ")");
+
+               buffer = g_string_append_len (buffer, display_name, parent_open - display_name);
+               if (parent_close) {
+                       buffer = g_string_append (buffer, parent_close + 1);
+               }
+       } else {
+               buffer = g_string_append (buffer, display_name);
+       }
+
+       comma_separator = g_strstr_len (buffer->str, -1, ", ");
+       if (comma_separator) {
+               gchar *surname, *name;
+               surname = g_strndup (buffer->str, comma_separator - buffer->str);
+               name = g_strdup (comma_separator + 2);
+
+               e_contact_set (contact, E_CONTACT_FAMILY_NAME, (const gpointer) surname);
+               e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) name);
+               g_free (name);
+               g_free (surname);
+       } else {
+               e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) buffer->str);
+       }
+
+       g_string_free (buffer, TRUE);
+       g_free (display_name);
 }
 
 static GList *
-get_contacts_for_name (const gchar *name)
+select_contacts_for_name_dialog (const gchar *name, GList *external_contacts)
 {
-       EBookQuery *full_name_book_query = NULL;
-       GList *result;
+       EBookQuery *book_query = NULL;
+       EBookView *book_view = NULL;
+       GList *result = NULL;
        gchar *unquoted;
-       GetContactsInfo *info;
-
-       if (name == NULL)
-               return NULL;
+       EBookQuery *queries[10];
+       gint i=0;
 
        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);
 
-       /* TODO: Make it launch a mainloop */
-       info = g_slice_new (GetContactsInfo);
-       info->mainloop = g_main_loop_new (NULL, FALSE);
-       info->result = NULL;
-       if (e_book_async_get_contacts (book, full_name_book_query, get_contacts_for_name_cb, info) == 0) {
-               GDK_THREADS_LEAVE ();
-               g_main_loop_run (info->mainloop);
-               GDK_THREADS_ENTER ();
-       } 
-       result = info->result;
-       e_book_query_unref (full_name_book_query);
-       g_main_loop_unref (info->mainloop);
-       g_slice_free (GetContactsInfo, info);
+       queries[i++] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       queries[i++] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       queries[i++] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       queries[i++] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       if (strchr (name, '@')) {
+               queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+               queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+               queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+               queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+               queries[i++] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       }
+       queries[i] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
+       book_query = e_book_query_or (i, queries, TRUE);
+       e_book_get_book_view (book, book_query, NULL, -1, &book_view, NULL);
+       e_book_query_unref (book_query);
+
+       if (book_view) {
+               GtkWidget *contact_dialog = NULL;
+               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_ALL,
+                                                                                  OSSO_ABOOK_CONTACT_ORDER_NAME);
+
+#ifdef MODEST_PLATFORM_MAEMO
+               if (external_contacts) {
+
+                       GList *row_list = NULL;
+                       while (external_contacts) {
+
+                               AsDbusRecipient *recipient = (AsDbusRecipient*)external_contacts->data;
+                               external_contacts = g_list_next (external_contacts);
+                               if (!recipient)
+                                       continue;
+
+                               char *uid = osso_abook_create_temporary_uid ();
+                               OssoABookContact *contact = osso_abook_contact_new ();
+                               osso_abook_contact_set_uid (contact, uid);
+                               e_contact_set (E_CONTACT (contact), E_CONTACT_FULL_NAME, recipient->display_name);
+                               osso_abook_contact_set_value (E_CONTACT (contact), EVC_EMAIL, recipient->email_address);
+
+                               OssoABookListStoreRow *row = osso_abook_list_store_row_new (contact);
+                               row_list = g_list_prepend (row_list, row);
+                               /* FIXME: unref row? */
+
+                               g_free (uid);
+                       }
+
+                       if (row_list) {
+                               osso_abook_list_store_merge_rows (OSSO_ABOOK_LIST_STORE (contact_model), row_list);
+                               g_list_free (row_list);
+                       }
+               }
+#endif
+
+               /* 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);
+       }
+       g_free (unquoted);
 
        return result;
 }
 
 static gboolean
-filter_by_name (OssoABookContactChooser *chooser,
-               OssoABookContact        *contact,
-               gpointer                 user_data)
+contact_name_or_email_starts_with (OssoABookContact *contact,
+                                   gpointer          user_data)
 {
-       const gchar *contact_name;
-       const gchar *name = (const gchar *) user_data;
+       const char *prefix = user_data;
+       GList *contacts, *l;
+       gboolean contact_match;
 
-       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;
-}
+       contacts = osso_abook_contact_get_roster_contacts (contact);
+       contacts = g_list_prepend (contacts, contact);
 
-static GList *
-select_contacts_for_name_dialog (const gchar *name)
-{
-       GtkWidget *contact_view;
-       OssoABookContactChooser *contact_dialog;
-       GList *result = NULL;
-       gchar *unquoted;
+       for (l = contacts; l; l = l->next) {
+               GList *attrs;
 
-       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);
+               contact_match = FALSE;
 
-       /* Enable multiselection */
-       osso_abook_contact_chooser_set_maximum_selection (contact_dialog, G_MAXUINT);
+               attrs = e_vcard_get_attributes (E_VCARD (l->data));
+               for (;attrs;attrs = attrs->next) {
+                       EVCardAttribute *attr = attrs->data;
+                       const char *name;
 
-       /* 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);
+                       name = e_vcard_attribute_get_name (attr);
 
-       if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
-               result = osso_abook_contact_chooser_get_selection (contact_dialog);
+                       if (!g_strcmp0 (name, "N") ||
+                           (strchr (prefix, '@') && !g_strcmp0 (name, "EMAIL"))) {
+                               GList *values = e_vcard_attribute_get_values (attr);
+                               gchar *prefix_down = g_utf8_strdown (prefix, -1);
 
-       g_free (unquoted);
+                               for (;values; values = values->next) {
+                                       gchar *value_down = NULL;
 
-       return result;
+                                       if (g_strcmp0 (values->data, ""))
+                                               value_down = g_utf8_strdown (values->data, -1);
+
+                                       if (value_down && g_str_has_prefix (value_down, prefix_down)) {
+                                               contact_match = TRUE;
+                                               g_free (value_down);
+                                               g_free (prefix_down);
+                                               goto out;
+                                       }
+                                       g_free (value_down);
+                               }
+                               g_free (prefix_down);
+                       }
+               }
+       }
+ out:
+       g_list_free (contacts);
+
+       return contact_match;
 }
 
 static gboolean
@@ -1012,7 +1093,8 @@ resolve_address (const gchar *address,
                 gboolean *canceled)
 {
        GList *resolved_contacts;
-       CheckNamesInfo *info;;
+       CheckNamesInfo *info;
+       OssoABookRoster *roster;
 
        g_return_val_if_fail (canceled, FALSE);
 
@@ -1021,8 +1103,8 @@ resolve_address (const gchar *address,
        *canceled = FALSE;
        info = g_slice_new0 (CheckNamesInfo);
        show_check_names_banner (info);
-       
-       contact_model = osso_abook_contact_model_new ();
+
+       contact_model = osso_abook_contact_model_get_default ();
        if (!open_addressbook ()) {
                hide_check_names_banner (info);
                if (contact_model) {
@@ -1033,23 +1115,123 @@ resolve_address (const gchar *address,
                return FALSE;
        }
 
-       resolved_contacts = get_contacts_for_name (address);
+       roster = osso_abook_aggregator_get_default (NULL);
+       resolved_contacts =
+               osso_abook_aggregator_find_contacts_full ((OssoABookAggregator *) roster,
+                                                         contact_name_or_email_starts_with,
+                                                         (gpointer) address);
+#ifdef MODEST_PLATFORM_MAEMO
+       GList *external_contacts = asdbus_resolve_recipients (address);
+#else
+       GList *external_contacts = NULL;
+#endif
        hide_check_names_banner (info);
 
-       if (resolved_contacts == NULL) {
+       if (resolved_contacts == NULL && NULL == external_contacts) {
                /* no matching contacts for the search string */
                modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE);
                clean_check_names_banner (info);
                return FALSE;
        }
 
-       if (g_list_length (resolved_contacts) > 1) {
+#ifdef MODEST_PLATFORM_MAEMO
+       /* check for duplicate emails and remove from external_contacts if any */
+       if (resolved_contacts && external_contacts) {
+
+               GList *node, *ex_node;
+
+               for (ex_node = external_contacts; ex_node != NULL; ex_node = g_list_next (ex_node)) {
+
+                       AsDbusRecipient *recipient = (AsDbusRecipient*)ex_node->data;
+                       if (!recipient)
+                               continue;
+
+                       for (node = resolved_contacts; node != NULL; node = g_list_next (node)) {
+
+                               EContact *contact = (EContact*)node->data;
+                               GList *emails = e_contact_get (contact, E_CONTACT_EMAIL);
+                               if (!emails)
+                                       continue;
+
+                               if (g_list_find_custom (emails, recipient->email_address, (GCompareFunc) compare_addresses)) {
+
+                                       g_free (recipient->display_name);
+                                       g_free (recipient->email_address);
+                                       g_free (recipient);
+                                       recipient = NULL;
+                                       ex_node->data = NULL;
+                               }
+
+                               g_list_foreach (emails, (GFunc) g_free, NULL);
+                               g_list_free (emails);
+
+                               if (!recipient)
+                                       break;
+                       }
+               }
+       }
+#endif
+
+       if (g_list_length (resolved_contacts) + g_list_length (external_contacts) > 1) {
                /* show a dialog to select the contact from the resolved ones */
                g_list_free (resolved_contacts);
 
-               resolved_contacts = select_contacts_for_name_dialog (address);
+               resolved_contacts = select_contacts_for_name_dialog (address, external_contacts);
+
+#ifdef MODEST_PLATFORM_MAEMO
+               if (external_contacts) {
+
+                       GList *node;
+                       for (node = external_contacts; node != NULL; node = g_list_next (node)) {
+
+                               AsDbusRecipient *recipient = (AsDbusRecipient*)node->data;
+                               if (!recipient)
+                                       continue;
+
+                               g_free (recipient->display_name);
+                               g_free (recipient->email_address);
+                               g_free (recipient);
+                       }
+
+                       g_list_free (external_contacts);
+                       external_contacts = NULL;
+               }
+#endif
        }
 
+#ifdef MODEST_PLATFORM_MAEMO
+       if (external_contacts) {
+
+               gboolean found = FALSE;
+               GList *node;
+               for (node = external_contacts; node != NULL; node = g_list_next (node)) {
+
+                       AsDbusRecipient *recipient = (AsDbusRecipient*)node->data;
+                       if (!recipient)
+                               continue;
+
+                       GString *formatted_recipient = g_string_new (NULL);
+                       g_string_printf (formatted_recipient, "\"%s\" <%s>", recipient->display_name, recipient->email_address);
+
+                       /* FIXME: why we have to have list of lists? */
+                       GSList *formattedlist = g_slist_append(NULL, formatted_recipient->str);
+                       *resolved_addresses = g_slist_append (*resolved_addresses, formattedlist);
+                       /* FIXME: how important is an UID? */
+                       *contact_ids = g_slist_append (*contact_ids, g_strdup ("temp-uid"));
+                       found = TRUE;
+
+                       g_string_free (formatted_recipient, FALSE); /* character data segment is NOT freed */
+                       g_free (recipient->display_name);
+                       g_free (recipient->email_address);
+                       g_free (recipient);
+               }
+
+               g_list_free (external_contacts);
+               external_contacts = NULL;
+               return found;
+        }
+#endif
+
        /* get the resolved contacts (can be no contact) */
        if (resolved_contacts) {
                GList *node;
@@ -1165,3 +1347,130 @@ modest_address_book_get_my_name ()
        else
                return NULL;
 }
+
+void
+modest_address_book_init (void)
+{
+       open_addressbook ();
+}
+
+void
+modest_address_book_add_address_list (GSList *address_list)
+{
+       EBookQuery **queries, *composite_query;
+       gint num_add, i;
+
+       g_return_if_fail (address_list);
+
+       if (!book)
+               if (!open_addressbook ())
+                       g_return_if_reached ();
+
+       /* Create the list of queries */
+       num_add = g_slist_length (address_list);
+       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 (address_list, 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, address_list);
+
+       /* Frees. This will unref the subqueries as well */
+       e_book_query_unref (composite_query);
+}
+
+static void
+selector_on_response (GtkDialog *dialog,
+                     gint       response_id,
+                     gpointer   user_data)
+{
+       if (response_id == GTK_RESPONSE_OK) {
+               gchar *current_selection = NULL;
+               GtkTreePath *selected_row = NULL;
+               HildonTouchSelector *selector;
+
+               selector = hildon_picker_dialog_get_selector (HILDON_PICKER_DIALOG (dialog));
+               selected_row = hildon_touch_selector_get_last_activated_row (selector, 0);
+               if (selected_row) {
+                       GtkTreeIter iter;
+                       GtkTreeModel *model = hildon_touch_selector_get_model (selector, 0);
+                       if (gtk_tree_model_get_iter (model, &iter, selected_row)) {
+                               gtk_tree_model_get (model, &iter, 0, &current_selection, -1);
+                               modest_address_book_add_address (current_selection, user_data);
+                               g_debug ("Current selection : %s", current_selection);
+                               g_free (current_selection);
+                       }
+               }
+       }
+
+       if (response_id != GTK_RESPONSE_DELETE_EVENT)
+               gtk_widget_destroy ((GtkWidget *) dialog);
+}
+
+static void
+selector_selection_changed (HildonTouchSelector * selector,
+                           gint column,
+                           gpointer *user_data)
+{
+       /* Close the dialog */
+       gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
+}
+
+void
+modest_address_book_add_address_list_with_selector (GSList *address_list, GtkWindow *parent)
+{
+       GtkWidget *picker_dialog;
+       HildonTouchSelector *selector;
+       GSList *node;
+       GtkTreeModel *model;
+       gboolean contacts_to_add = FALSE;
+
+       /* We cannot use hildon_touch_selector_new_text() because
+          there is a bug in hildon that does not retrieve the current
+          selected text when using MODES_NORMAL. So we need a
+          temporary workaround here */
+       selector = (HildonTouchSelector*) hildon_touch_selector_new ();
+
+       model = (GtkTreeModel *) gtk_list_store_new (1,  G_TYPE_STRING);
+       hildon_touch_selector_append_text_column (selector, model, TRUE);
+       hildon_touch_selector_set_hildon_ui_mode (selector, HILDON_UI_MODE_NORMAL);
+       g_object_unref (model);
+
+       for (node = address_list; node != NULL; node = g_slist_next (node)) {
+               const gchar *recipient = (const gchar *) node->data;
+               if (modest_text_utils_validate_recipient (recipient, NULL)) {
+                       if (!modest_address_book_has_address (recipient)) {
+                               GtkTreeIter iter;
+                               gtk_list_store_append ((GtkListStore *) model, &iter);
+                               gtk_list_store_set ((GtkListStore *) model, &iter, 0, recipient, -1);
+                               contacts_to_add = TRUE;
+                       }
+               }
+       }
+
+       if (contacts_to_add) {
+               picker_dialog = hildon_picker_dialog_new (parent);
+               gtk_window_set_title (GTK_WINDOW (picker_dialog), _("mcen_me_viewer_addtocontacts"));
+
+               hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (picker_dialog),
+                                                  selector);
+
+               g_signal_connect ((GObject*) selector, "changed",
+                                 G_CALLBACK (selector_selection_changed), picker_dialog);
+
+               g_signal_connect ((GObject*) picker_dialog, "response",
+                                 G_CALLBACK (selector_on_response), parent);
+
+               gtk_widget_show (picker_dialog);
+       } else {
+               gtk_widget_destroy ((GtkWidget *) selector);
+       }
+}