From ed1fa5121bcbcf072e51c82f64c472d2d4d33ec5 Mon Sep 17 00:00:00 2001 From: Sushma Rai Date: Wed, 10 May 2006 08:25:25 +0000 Subject: Not displaying error message on cancel operation. Fixes #332131. svn path=/trunk/; revision=31966 --- plugins/exchange-operations/ChangeLog | 6 ++++++ plugins/exchange-operations/exchange-account-setup.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins') 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 + + * 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 * 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) { -- cgit v1.2.3