X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-address-book.c;h=0f1e92d5af13834e1ee97a084ed58f3f3efec13a;hp=b90d7f1960dabb35bb89a3467282e8111f12f73b;hb=713491eaf9b5fee779f83fdba1c8cacfb865de39;hpb=af95a0dd641606061b0aa484c0cd63d2cdb47124 diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c index b90d7f1..0f1e92d 100644 --- a/src/hildon2/modest-address-book.c +++ b/src/hildon2/modest-address-book.c @@ -38,6 +38,7 @@ #include #include "modest-hildon-includes.h" #include +#include #include "modest-platform.h" #include "modest-runtime.h" #include "widgets/modest-window-mgr.h" @@ -56,7 +57,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,143 +65,48 @@ 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 -open_addressbook () -{ - book = e_book_new_system_addressbook (NULL); - if (!book) - return FALSE; - - if (e_book_async_open (book, FALSE, book_open_cb, NULL) != E_BOOK_ERROR_OK) - return FALSE; - - return TRUE; /* FIXME */ -} - -typedef struct _OpenAddressbookSyncInfo { - gboolean retval; - GMainLoop *mainloop; -} OpenAddressbookSyncInfo; - -static void -get_book_view_sync_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data) -{ - 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; - } - 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); -} - static gboolean -open_addressbook_sync () +open_addressbook () { - OpenAddressbookSyncInfo *info; - gboolean retval; - - book = e_book_new_system_addressbook (NULL); - if (!book) - return FALSE; - - 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); + OssoABookRoster *roster; + GError *error = NULL; + time_t init,end; + + if (book && book_view) + return TRUE; + + roster = osso_abook_aggregator_get_default (&error); + if (error) + goto error; + + /* 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 (error) + goto error; + + if (!osso_abook_waitable_is_ready ((OssoABookWaitable *) roster, + &error)) + goto error; + + book = osso_abook_roster_get_book (roster); + book_view = osso_abook_roster_get_book_view (roster); + + return TRUE; + error: + g_warning ("error opening addressbook %s", error->message); + g_error_free (error); + return FALSE; } 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; @@ -212,10 +117,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); @@ -229,14 +135,7 @@ void 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; @@ -244,31 +143,6 @@ 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 (parent_window, _AB("addr_ti_dia_select_contacts"), @@ -281,7 +155,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; @@ -304,15 +177,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)); @@ -371,23 +235,18 @@ 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); + 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); } -#if MODEST_ABOOK_API >= 4 g_object_unref (abook_contact); -#endif } if (emailid) { @@ -426,43 +285,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 { - GError *err = NULL; - if (is_new) { - if (!e_book_add_contact (book, contact, &err)) { - g_warning ("Failed to add contact: %s", err->message); - g_error_free (err); - } - } else { - if (!e_book_commit_contact (book, contact, &err)) { - g_warning ("Failed to commit contact: %s", err->message); - g_error_free (err); - } - } - } -#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. @@ -518,10 +340,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); } @@ -671,13 +492,36 @@ select_email_addrs_for_contact(GList * email_addr_list) 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_down, *mail2_down; + + /* Perform a case insensitive comparison */ + mail1 = modest_text_utils_get_email_address (address1); + 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; +} + static EContact * get_contact_for_address (GList *contacts, const gchar *address) { EContact *retval = NULL, *contact; GList *iter; + gchar *email; + email = modest_text_utils_get_email_address (address); iter = contacts; while (iter && !retval) { GList *emails = NULL; @@ -686,7 +530,7 @@ get_contact_for_address (GList *contacts, emails = e_contact_get (contact, E_CONTACT_EMAIL); if (emails) { /* Look for the email address */ - if (g_list_find_custom (emails, address, (GCompareFunc) g_strcmp0)) + if (g_list_find_custom (emails, email, (GCompareFunc) compare_addresses)) retval = contact; /* Free the list */ @@ -695,6 +539,8 @@ get_contact_for_address (GList *contacts, } iter = g_list_next (iter); } + g_free (email); + return retval; } @@ -738,12 +584,15 @@ 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) { @@ -777,44 +626,8 @@ async_get_contacts_cb (EBook *book, g_slist_foreach (addresses, (GFunc) g_free, NULL); g_slist_free (addresses); } - if (contacts) { - g_list_foreach (contacts, (GFunc) g_object_unref, NULL); + 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 { @@ -908,11 +721,12 @@ 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; @@ -937,7 +751,6 @@ 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; @@ -948,7 +761,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat 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); @@ -1026,14 +839,14 @@ 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); + g_slist_free (addr_list); store_address = TRUE; } } @@ -1041,8 +854,8 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat /* 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 && store_address) + *address_list = g_slist_prepend (*address_list, address); else g_free (address); @@ -1053,9 +866,9 @@ 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); + /* 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); @@ -1093,66 +906,76 @@ get_contacts_for_name_cb (EBook *book, static GList * get_contacts_for_name (const gchar *name) { - EBookQuery *full_name_book_query = NULL; + EBookQuery *book_query = NULL; GList *result; gchar *unquoted; GetContactsInfo *info; + EBookQuery *queries[10]; if (name == NULL) return NULL; unquoted = unquote_string (name); - full_name_book_query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_CONTAINS, unquoted); + + queries[0] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[1] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[2] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[3] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[4] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[5] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[6] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[7] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[8] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[9] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + book_query = e_book_query_or (10, queries, TRUE); + 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) { + if (e_book_async_get_contacts (book, 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); + e_book_query_unref (book_query); g_main_loop_unref (info->mainloop); g_slice_free (GetContactsInfo, info); return result; } + static GList * select_contacts_for_name_dialog (const gchar *name) { - EBookQuery *full_name_book_query = NULL; + EBookQuery *book_query = NULL; EBookView *book_view = NULL; GList *result = NULL; gchar *unquoted; + EBookQuery *queries[10]; 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); + + queries[0] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[1] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[2] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[3] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[4] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[5] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[6] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[7] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[8] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted); + queries[9] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted); + book_query = e_book_query_or (10, 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; -#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); - - contact_view = osso_abook_contact_selector_new_basic (contact_model); - contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view)); - - 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); @@ -1172,8 +995,8 @@ select_contacts_for_name_dialog (const gchar *name) e_book_view_stop (book_view); g_object_unref (book_view); gtk_widget_destroy (contact_dialog); -#endif /* MODEST_ABOOK_API < 4 */ } + g_free (unquoted); return result; } @@ -1194,9 +1017,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); @@ -1242,7 +1065,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); @@ -1290,42 +1112,37 @@ 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 : ""); + + 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); - e_book_query_unref (query); 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; @@ -1336,5 +1153,95 @@ modest_address_book_get_my_name () { OssoABookSelfContact *self_contact = osso_abook_self_contact_get_default (); - return osso_abook_contact_get_display_name (OSSO_ABOOK_CONTACT (self_contact)); + /* 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 (); +} + +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); +} + +void +modest_address_book_add_address_list_with_selector (GSList *address_list, GtkWindow *parent) +{ + GtkWidget *picker_dialog; + GtkWidget *selector; + GSList *node; + gchar *selected = NULL; + gboolean contacts_to_add = FALSE; + + selector = hildon_touch_selector_new_text (); + g_object_ref (selector); + + for (node = address_list; node != NULL; node = g_slist_next (node)) { + if (!modest_address_book_has_address ((const gchar *) node->data)) { + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), + (const gchar *) node->data); + contacts_to_add = TRUE; + } + } + + if (contacts_to_add) { + gint picker_result; + + 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), + HILDON_TOUCH_SELECTOR (selector)); + + picker_result = gtk_dialog_run (GTK_DIALOG (picker_dialog)); + + if (picker_result == GTK_RESPONSE_OK) { + selected = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)); + } + gtk_widget_destroy (picker_dialog); + + if (selected) + modest_address_book_add_address (selected, parent); + g_free (selected); + + } else { + g_object_unref (selector); + } }