{
OssoABookAccount *account = NULL;
GtkWidget *dialog = NULL;
+ gchar *email_address = NULL;
contact_model = osso_abook_contact_model_new ();
if (!open_addressbook ()) {
}
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);
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));
-
if (!open_addressbook ()) {
if (contact_model) {
g_object_unref (contact_model);
EBookQuery *query;
GList *contacts = NULL;
GError *err = NULL;
+ gchar *email;
g_return_val_if_fail (address, FALSE);
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 : "<unknown>");
} 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 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, gboolean update_addressbook)
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);
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_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);
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);
+ 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);
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;
}
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);
return FALSE;
}
/* 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;
}
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 */
projects / modest / blobdiff