X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=4391355b99add9051f2ae37ced14fc0326634c44;hp=85369e6403fff6334127fdfc49607bf50001448a;hb=324b0b5e7372e83bc4b50fa9804825e296785d76;hpb=f437bc152701d9a9b7cb75988ef04b30bbb0c8b4 diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c index 85369e6..4391355 100644 --- a/src/maemo/modest-address-book.c +++ b/src/maemo/modest-address-book.c @@ -38,6 +38,8 @@ #include #include "modest-hildon-includes.h" #include "modest-platform.h" +#include "modest-runtime.h" +#include "widgets/modest-window-mgr.h" #include #include #include @@ -187,6 +189,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view)); gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients")); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog)); gtk_widget_show (contact_dialog); @@ -586,6 +589,7 @@ add_to_address_book (const gchar* address) EBookQuery *query; GList *contacts = NULL; GError *err = NULL; + gchar *email; g_return_val_if_fail (address, FALSE); @@ -593,8 +597,10 @@ add_to_address_book (const gchar* address) open_addressbook (); 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, 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 : ""); @@ -616,31 +622,50 @@ add_to_address_book (const gchar* address) } else { /* it's not yet in the addressbook, add it now! */ EContact *new_contact = e_contact_new (); - e_contact_set (new_contact, E_CONTACT_EMAIL_1, (const gpointer)address); + 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); + } + 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); } + g_free (email); + return TRUE; } static gboolean -show_check_names_banner (gpointer data) +show_check_names_banner (gpointer userdata) { - GtkWidget **banner = (GtkWidget **) data; + GtkWidget **banner = (GtkWidget **) userdata; - /* We're outside the main lock */ gdk_threads_enter (); - - *banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names")); - g_object_ref (G_OBJECT (*banner)); - + *banner = modest_platform_animation_banner (NULL, NULL, _("mail_ib_checking_names")); gdk_threads_leave (); return FALSE; } +static void +hide_check_names_banner (GtkWidget **banner, guint banner_timeout) +{ + g_source_remove (banner_timeout); + if (*banner != NULL) { + gtk_widget_destroy (*banner); + *banner = NULL; + } else { + g_source_remove (banner_timeout); + } + +} + gboolean modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook) { @@ -652,22 +677,14 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat gint offset_delta = 0; gint last_length; GtkTextIter start_iter, end_iter; - GtkWidget *banner = NULL; - guint show_banner_timeout; g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE); - show_banner_timeout = g_timeout_add (2000, show_check_names_banner, &banner); recipients = modest_recpt_editor_get_recipients (recpt_editor); last_length = g_utf8_strlen (recipients, -1); modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes); if (start_indexes == NULL) { - g_source_remove (show_banner_timeout); - if (banner != NULL) { - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT(banner)); - } if (last_length != 0) { hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts")); return FALSE; @@ -685,6 +702,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat 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; @@ -692,7 +710,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat start_ptr = g_utf8_offset_to_pointer (recipients, start_pos); end_ptr = g_utf8_offset_to_pointer (recipients, end_pos); - address = g_strndup (start_ptr, end_ptr - start_ptr); + address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr)); 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); @@ -711,6 +729,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat /* here goes searching in addressbook */ gchar *contact_id = NULL; GSList *resolved_addresses = NULL; + result = resolve_address (address, &resolved_addresses, &contact_id); if (result) { @@ -757,13 +776,14 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat address_list, ""); g_slist_free (address_list); + store_address = TRUE; } } /* 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) + if (result && update_addressbook && store_address) add_to_address_book (address); g_free (address); @@ -779,12 +799,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat gtk_text_buffer_place_cursor (buffer, &end_iter); } - g_source_remove (show_banner_timeout); - if (banner != NULL) { - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT (banner)); - } - g_slist_foreach (start_indexes, (GFunc) g_free, NULL); g_slist_foreach (end_indexes, (GFunc) g_free, NULL); g_slist_free (start_indexes); @@ -852,6 +866,10 @@ static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, gchar **contact_id) { GList *resolved_contacts; + guint banner_timeout; + GtkWidget *banner = NULL; + + banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); contact_model = osso_abook_contact_model_new (); if (!open_addressbook_sync ()) { @@ -866,7 +884,9 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont if (resolved_contacts == NULL) { /* no matching contacts for the search string */ - modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts")); + modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE); + hide_check_names_banner (&banner, banner_timeout); + return FALSE; } @@ -874,25 +894,34 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont /* show a dialog to select the contact from the resolved ones */ g_list_free (resolved_contacts); + hide_check_names_banner (&banner, banner_timeout); resolved_contacts = select_contacts_for_name_dialog (address); + banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); + } /* get the resolved contacts (can be no contact) */ if (resolved_contacts) { + gboolean found; EContact *contact = (EContact *) resolved_contacts->data; *resolved_addresses = get_recipients_for_given_contact (contact); + hide_check_names_banner (&banner, banner_timeout); if (*resolved_addresses) { *contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID)); + found = TRUE; + } else { + found = FALSE; } g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL); g_list_free (resolved_contacts); - return TRUE; + return found; } else { /* cancelled dialog to select more than one contact or * selected no contact */ + hide_check_names_banner (&banner, banner_timeout); return FALSE; }