Fixes NB#124155, done button in "select contacts" for name dialog does not close...

[modest] / src / hildon2 / modest-address-book.c

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 034d14c..b6b59b8 100644 (file)
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -68,19 +68,39 @@ static gboolean
 open_addressbook ()
 {
        OssoABookRoster *roster;
+       GError *error = NULL;
+       time_t init,end;
 
        if (book && book_view)
                return TRUE;
 
-       roster = osso_abook_aggregator_get_default (NULL);
-       if (roster) {
-               book = osso_abook_roster_get_book (roster);
-               book_view = osso_abook_roster_get_book_view (roster);
+       roster = osso_abook_aggregator_get_default (&error);
+       if (error)
+               goto error;
 
-               return TRUE;
-       } else {
-               return FALSE;
-       }
+       /* 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
@@ -219,7 +239,7 @@ get_recipients_for_given_contact (EContact * contact,
 
                emailid = get_email_addr_from_user(display_name, canceled);
                if (emailid) {
-                       e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
+                       e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL_1, emailid);
                        osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
                }
                g_object_unref (abook_contact);
@@ -595,10 +615,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);
-       }
 }
 
 
@@ -766,7 +784,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);
 
@@ -872,8 +890,11 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
        }
 
        /* Add addresses to address-book */
-       if (to_commit_addresses)
-               add_to_address_book (to_commit_addresses);
+       if (to_commit_addresses) {
+               to_commit_addresses = modest_text_utils_remove_duplicate_addresses_list (to_commit_addresses);
+               if (to_commit_addresses)
+                       add_to_address_book (to_commit_addresses);
+       }
 
        if (current_start == NULL) {
                gtk_text_buffer_get_end_iter (buffer, &end_iter);
@@ -982,6 +1003,8 @@ select_contacts_for_name_dialog (const gchar *name)
        if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
                result = osso_abook_contact_chooser_get_selection (contact_dialog);
 
+       gtk_widget_destroy ((GtkWidget *) contact_dialog);
+
        g_free (unquoted);
 
        return result;
@@ -1003,8 +1026,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) {
@@ -1051,7 +1074,6 @@ resolve_address (const gchar *address,
                        }
                }
 
-               g_list_foreach (resolved_contacts, (GFunc)g_object_unref, NULL);
                g_list_free (resolved_contacts);
                clean_check_names_banner (info);
 
@@ -1099,42 +1121,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 : "<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);
-               e_book_query_unref (query);
                return FALSE;
        }
-       e_book_query_unref (query);
 
-       result = (contacts != NULL);
        if (contacts) {
-               g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
                g_list_free (contacts);
+               result = TRUE;
        }
-       
+
        g_free (email);
 
        return result;
@@ -1153,3 +1170,9 @@ modest_address_book_get_my_name ()
        else
                return NULL;
 }
+
+void
+modest_address_book_init (void)
+{
+       open_addressbook ();
+}