* Adds the force parameter to the connect_and_perform which forces the device to...

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

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 9a08cd2..e8e6c63 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);
@@ -628,17 +625,6 @@ add_to_address_book (const gchar* address)
        return TRUE;
 }
 
-static gboolean
-show_check_names_banner (gpointer data)
-{
-       GtkWidget **banner = (GtkWidget **) data;
-
-       *banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names"));
-       g_object_ref (G_OBJECT (*banner));
-
-       return FALSE;
-}
-
 gboolean
 modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
 {
@@ -650,23 +636,22 @@ 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);
+       modest_platform_information_banner (NULL, NULL, _("mail_ib_checking_names"));
+
        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;
+               } else {
+                       return TRUE;
                }
-               return TRUE;
        }
 
        current_start = start_indexes;
@@ -685,7 +670,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);
@@ -772,12 +757,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);
@@ -872,17 +851,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 */