X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=9b3541ff8f9535f9365cb1a676a8ac30d11d8e92;hp=bf199f7a82b41e63c1123a891f459f4e8ab20144;hb=e3480a667fa614794b145a9b3d5124e64e26198f;hpb=51cc36c187e300ea0db5e3cff2bdeb687f8c2d28 diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c index bf199f7..9b3541f 100644 --- a/src/maemo/modest-address-book.c +++ b/src/maemo/modest-address-book.c @@ -37,6 +37,7 @@ #include #include #include "modest-hildon-includes.h" +#include "modest-platform.h" #include #include #include @@ -50,7 +51,7 @@ static EBook *book = NULL; static EBookView * book_view = NULL; static GSList *get_recipients_for_given_contact(EContact * contact); -static void commit_contact(EContact * contact); +static void commit_contact(EContact * contact, gboolean is_new); static gchar *get_email_addr_from_user(const gchar * given_name); static gchar *ui_get_formatted_email_id(gchar * current_given_name, gchar * current_sur_name, gchar * current_email_id); @@ -61,6 +62,14 @@ 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) { @@ -121,6 +130,7 @@ modest_address_book_add_address (const gchar *address) { OssoABookAccount *account = NULL; GtkWidget *dialog = NULL; + gchar *email_address = NULL; contact_model = osso_abook_contact_model_new (); if (!open_addressbook ()) { @@ -130,8 +140,11 @@ modest_address_book_add_address (const gchar *address) } return; } + + email_address = modest_text_utils_get_email_address (address); - account = osso_abook_account_get (EVC_EMAIL, NULL, address); + account = osso_abook_account_get (EVC_EMAIL, NULL, email_address); + g_free (email_address); if (account) { dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account); @@ -157,13 +170,9 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) GSList *email_addrs_per_contact = NULL; gchar *econtact_id; gboolean focus_recpt_editor = FALSE; - GtkWidget *toplevel; g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor)); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor)); - - contact_model = osso_abook_contact_model_new (); if (!open_addressbook ()) { if (contact_model) { g_object_unref (contact_model); @@ -171,12 +180,12 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) } 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)); - osso_abook_select_dialog_set_new_contact (OSSO_ABOOK_SELECT_DIALOG (contact_dialog), TRUE); gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients")); gtk_widget_show (contact_dialog); @@ -275,7 +284,7 @@ static GSList *get_recipients_for_given_contact(EContact * contact) if (emailid) { e_contact_set(contact, E_CONTACT_EMAIL_1, emailid); - commit_contact(contact); + commit_contact(contact, FALSE); } } @@ -321,15 +330,18 @@ static GSList *get_recipients_for_given_contact(EContact * contact) * @return void */ static void -commit_contact(EContact * contact) +commit_contact(EContact * contact, gboolean is_new) { + g_return_if_fail (contact); + g_return_if_fail (book); + if (!contact || !book) return; - -#ifdef MODEST_HILDON_VERSION_0 - osso_abook_contact_commit(contact, FALSE, book); + +#ifdef MODEST_HAVE_OLD_ABOOK + osso_abook_contact_commit(contact, is_new, book); #else - osso_abook_contact_commit(contact, FALSE, book, NULL); + osso_abook_contact_commit(contact, is_new, book, NULL); #endif /* MODEST_HILDON_VERSION_0 */ } @@ -450,13 +462,24 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name) result = gtk_dialog_run(GTK_DIALOG(add_email_addr_to_contact_dlg)); if (result == GTK_RESPONSE_ACCEPT) { + const gchar *invalid_char_offset = NULL; new_email_addr = g_strdup(gtk_entry_get_text(GTK_ENTRY(email_entry))); new_email_addr = g_strstrip(new_email_addr); - if (!modest_text_utils_validate_email_address (new_email_addr)) { + if (!modest_text_utils_validate_email_address (new_email_addr, &invalid_char_offset)) { gtk_widget_grab_focus(email_entry); + if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) { + gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset); + gchar *message = g_strdup_printf( + dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), + char_in_string); + hildon_banner_show_information ( + add_email_addr_to_contact_dlg, NULL, message ); + g_free (message); + } else { + hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email")); + run_dialog = TRUE; + } gtk_editable_select_region((GtkEditable *) email_entry, 0, -1); - hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email")); - run_dialog = TRUE; g_free(new_email_addr); new_email_addr = NULL; } @@ -503,6 +526,10 @@ select_email_addrs_for_contact(GList * email_addr_list) _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL); gtk_dialog_set_has_separator(GTK_DIALOG(select_email_addr_dlg), FALSE); + /* Make the window approximately big enough, because it doesn't resize to be big enough + * for the window title text: */ + gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), 400, -1); + scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(select_email_addr_dlg)->vbox), scrolledwindow, TRUE, TRUE, 0); @@ -552,8 +579,79 @@ select_email_addrs_for_contact(GList * email_addr_list) return selected_email_addr_list; } + +static gboolean /* make this public? */ +add_to_address_book (const gchar* address) +{ + EBookQuery *query; + GList *contacts = NULL; + GError *err = NULL; + gchar *email; + + g_return_val_if_fail (address, FALSE); + + if (!book) + 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, email); + if (!e_book_get_contacts (book, query, &contacts, &err)) { + g_printerr ("modest: failed to get contacts: %s", + err ? err->message : ""); + if (err) + g_error_free (err); + return FALSE; + } + 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); + } + 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 userdata) +{ + GtkWidget **banner = (GtkWidget **) userdata; + + gdk_threads_enter (); + *banner = modest_platform_animation_banner (NULL, NULL, _("mail_ib_checking_names")); + gdk_threads_leave (); + + return FALSE; +} + gboolean -modest_address_book_check_names (ModestRecptEditor *recpt_editor) +modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook) { const gchar *recipients = NULL; GSList *start_indexes = NULL, *end_indexes = NULL; @@ -563,23 +661,26 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) gint offset_delta = 0; gint last_length; GtkTextIter start_iter, end_iter; - GtkWidget *banner; + guint banner_timeout; + GtkWidget *banner = NULL; g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE); - banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names")); - g_object_ref (G_OBJECT (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) { - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT(banner)); - return TRUE; + if (last_length != 0) { + hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts")); + return FALSE; + } else { + return TRUE; + } } + banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); + current_start = start_indexes; current_end = end_indexes; buffer = modest_recpt_editor_get_buffer (recpt_editor); @@ -588,6 +689,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) gchar *address; gchar *start_ptr, *end_ptr; gint start_pos, end_pos; + const gchar *invalid_char_position = NULL; start_pos = (*((gint*) current_start->data)) + offset_delta; end_pos = (*((gint*) current_end->data)) + offset_delta; @@ -595,13 +697,22 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) 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); - if (!modest_text_utils_validate_recipient (address)) { - if (strstr (address, "@") == NULL) { + if (!modest_text_utils_validate_recipient (address, &invalid_char_position)) { + if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) { + gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position); + gchar *message = g_strdup_printf( + dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), + char_in_string); + g_free (char_in_string); + hildon_banner_show_information (NULL, NULL, message ); + g_free (message); + result = FALSE; + } else if (strstr (address, "@") == NULL) { /* here goes searching in addressbook */ gchar *contact_id = NULL; GSList *resolved_addresses = NULL; @@ -622,15 +733,44 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) recipients = modest_recpt_editor_get_recipients (recpt_editor); new_length = g_utf8_strlen (recipients, -1); offset_delta = offset_delta + new_length - last_length; - last_length = new_length; + last_length = new_length; } } else { /* this address is not valid, select it and return control to user showing banner */ - hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); result = FALSE; } + } else { + GSList *tags, *node; + gboolean has_recipient = FALSE; + + tags = gtk_text_iter_get_tags (&start_iter); + for (node = tags; node != NULL; node = g_slist_next (node)) { + GtkTextTag *tag = GTK_TEXT_TAG (node->data); + if (g_object_get_data (G_OBJECT (tag), "recipient-tag-id") != NULL) { + has_recipient = TRUE; + break; + } + } + g_slist_free (tags); + if (!has_recipient) { + GSList * address_list = NULL; + + address_list = g_slist_prepend (address_list, address); + modest_recpt_editor_replace_with_resolved_recipient (recpt_editor, + &start_iter, &end_iter, + address_list, + ""); + g_slist_free (address_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) + add_to_address_book (address); + g_free (address); if (result == FALSE) break; @@ -644,15 +784,19 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) gtk_text_buffer_place_cursor (buffer, &end_iter); } - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT (banner)); - modest_recpt_editor_grab_focus (recpt_editor); - g_slist_foreach (start_indexes, (GFunc) g_free, NULL); g_slist_foreach (end_indexes, (GFunc) g_free, NULL); g_slist_free (start_indexes); g_slist_free (end_indexes); + g_source_remove (banner_timeout); + if (banner != NULL) { + gtk_widget_destroy (banner); + banner = NULL; + } else { + g_source_remove (banner_timeout); + } + return result; } @@ -729,7 +873,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont if (resolved_contacts == NULL) { /* no matching contacts for the search string */ - hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts")); + modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts")); return FALSE; } @@ -742,14 +886,21 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont /* 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); if (*resolved_addresses) { *contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID)); + found = TRUE; + } else { + found = FALSE; } - /* TODO: free the resolved_contacts list */ - return TRUE; + + g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL); + g_list_free (resolved_contacts); + + return found; } else { /* cancelled dialog to select more than one contact or * selected no contact */