aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/exchange-operations/ChangeLog6
-rw-r--r--plugins/exchange-operations/exchange-account-setup.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index fdc4b15a99..76695618a0 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-10 Sushma Rai <rsushma@novell.com>
+
+ * exchange-account-setup.c (owa_authenticate_user): Display error
+ message only in case of authentication failure and not on cancelling
+ authentication operation. Fixes #332131
+
2006-04-19 Sushma Rai <rsushma@novell.com>
* exchange-contacts.c (e_exchange_contacts_commit): Setting the
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index ce63d1ef06..32b66f9e10 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -464,8 +464,9 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
valid = e2k_validate_user (owa_url, &url->user, exchange_params,
&remember_password, &result);
- if (!valid)
+ if (!valid && result != E2K_AUTOCONFIG_CANCELLED)
print_error (owa_url, result);
+
camel_url_set_host (url, valid ? exchange_params->host : "");
if (valid) {