* Fixes NB#64997, Modest is now able to send an email after removing the trailing...

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

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 8fe6536..294541d 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -170,12 +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));
-
        if (!open_addressbook ()) {
                if (contact_model) {
                        g_object_unref (contact_model);
@@ -695,7 +692,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);
@@ -882,17 +879,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;
                }
 
                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 */