Added page check for receive page, so that one can proceed with the account

creation only after user is authenticated and hostname is set by validate().

svn path=/trunk/; revision=28893

2 files changed, 14 insertions, 1 deletions

diff --git a/plugins/exchange-account-setup/ChangeLog b/plugins/exchange-account-setup/ChangeLog
index 4e2e4fdc1f..be48a9f67b 100644
--- a/plugins/exchange-account-setup/ChangeLog
+++ b/plugins/exchange-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-26  Sushma Rai  <rtsushma@novell.com>
+
+        * exchange-account-setup.c (org_gnome_exchange_check_options):
+        Returning FALSE on NULL host name or set to "" for receive page, 
+	so that one can proceed with the account creation only after 
+	hostname is retrived and set by validate().
+
 2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
 
 	* org-gnome-exchange-account-setup.eplug.in: Added author and
diff --git a/plugins/exchange-account-setup/exchange-account-setup.c b/plugins/exchange-account-setup/exchange-account-setup.c
index 77fb6ea244..e5b1f03a55 100644
--- a/plugins/exchange-account-setup/exchange-account-setup.c
+++ b/plugins/exchange-account-setup/exchange-account-setup.c
@@ -375,7 +375,13 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 
 	/* We assume that if the host is set, then the setting is valid.
 	   The host gets set when the provider validate() call is made */
-	if (data->pageid == NULL || strcmp(data->pageid, "20.receive_options") == 0) {
+	/* We do this check for receive page also, so that user can
+	 * proceed with the account set up only after user is validated,
+	 * and host name is reset by validate() call
+	 */
+	if (data->pageid == NULL ||
+	    strcmp (data->pageid, "10.receive") == 0 ||
+	    strcmp (data->pageid, "20.receive_options") == 0) {
 		CamelURL *url;
 
 		url = camel_url_new(e_account_get_string(target->account,  E_ACCOUNT_SOURCE_URL), NULL);