From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 2 Mar 2009 16:32:35 +0000 (+0000)
Subject: * Fixes NB#103918, hide checking names after connecting to the addressbook
X-Git-Tag: git_migration_finished~444
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=07213535c20deff5ef4f93bbed710bc00f4ed9ff

* Fixes NB#103918, hide checking names after connecting to the addressbook

pmo-trunk-r7761
---

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 267b713..5f5cb18 100644
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -999,20 +999,20 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 
 	contact_model = osso_abook_contact_model_new ();
 	if (!open_addressbook_sync ()) {
+		hide_check_names_banner (&banner, banner_timeout);
 		if (contact_model) {
 			g_object_unref (contact_model);
 			contact_model = NULL;
 		}
 		return FALSE;
 	}
+	hide_check_names_banner (&banner, banner_timeout);
 
 	resolved_contacts = get_contacts_for_name (address);
 
 	if (resolved_contacts == NULL) {
 		/* no matching contacts for the search string */
 		modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE);
-		hide_check_names_banner (&banner, banner_timeout);
-     
 		return FALSE;
 	}
 
@@ -1020,19 +1020,17 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 		/* show a dialog to select the contact from the resolved ones */
 		g_list_free (resolved_contacts);
 
-		hide_check_names_banner (&banner, banner_timeout);     
 		resolved_contacts = select_contacts_for_name_dialog (address);
 		banner_timeout = g_timeout_add (500, show_check_names_banner, &banner);
 
 	}
-	
+
 	/* 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);
-		hide_check_names_banner (&banner, banner_timeout);     
 		if (*resolved_addresses) {
 			*contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID));
 			found = TRUE;
@@ -1047,7 +1045,6 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 	} else {
 		/* cancelled dialog to select more than one contact or
 		 * selected no contact */
-		hide_check_names_banner (&banner, banner_timeout);     
 		return FALSE;
 	}