* Fixes NB#78850, "Checking names" information banner is now properly shown

pmo-trunk-r4000

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 294541d..e8e6c63 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -625,22 +625,6 @@ add_to_address_book (const gchar* address)
        return TRUE;
 }
 
        return TRUE;
 }
 

-static gboolean
-show_check_names_banner (gpointer data)
-{
-       GtkWidget **banner = (GtkWidget **) data;
-
-       /* 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));
-
-       gdk_threads_leave ();
-
-       return FALSE;
-}
-

 gboolean
 modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
 {
 gboolean
 modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
 {

@@ -652,22 +636,16 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
        gint offset_delta = 0;
        gint last_length;
        GtkTextIter start_iter, end_iter;
        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);
 
 
        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) {
        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;
                if (last_length != 0) {
                        hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts"));
                        return FALSE;

@@ -779,12 +757,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
                gtk_text_buffer_place_cursor (buffer, &end_iter);
        }
 
                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);
        g_slist_foreach (start_indexes, (GFunc) g_free, NULL);
        g_slist_foreach (end_indexes, (GFunc) g_free, NULL);
        g_slist_free (start_indexes);