aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-01-18 22:03:35 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-01-18 22:03:35 +0800
commit01ca679d17f577ce7d2e7c74a634c609e253de3a (patch)
treec463b9138ce47a10fdeb191a17aa0c773cbf8cd6
parent3530abbdb438b9189a465ba660fe262f00868a6b (diff)
downloadgsoc2013-evolution-01ca679d17f577ce7d2e7c74a634c609e253de3a.tar.gz
gsoc2013-evolution-01ca679d17f577ce7d2e7c74a634c609e253de3a.tar.zst
gsoc2013-evolution-01ca679d17f577ce7d2e7c74a634c609e253de3a.zip
Reading the user validate function return value, so that reference count is
handled properly and password dialog comes up on pressing ok button, in failure cases. svn path=/trunk/; revision=28439
-rw-r--r--plugins/exchange-account-setup/ChangeLog5
-rw-r--r--plugins/exchange-account-setup/exchange-ask-password.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/exchange-account-setup/ChangeLog b/plugins/exchange-account-setup/ChangeLog
index 1015f5140c..5d64bf49dc 100644
--- a/plugins/exchange-account-setup/ChangeLog
+++ b/plugins/exchange-account-setup/ChangeLog
@@ -1,5 +1,10 @@
2005-01-18 Sushma Rai <rsushma@novell.com>
+ * exchange-ask-password.c (validate_exchange_user): Reading the return
+ value of user validation function. Fixes #71385
+
+2005-01-18 Sushma Rai <rsushma@novell.com>
+
* exchange-ask-password.c (validate_exchange_user): Filling up
user name so that page check doesn't fail. Fixes #71384
diff --git a/plugins/exchange-account-setup/exchange-ask-password.c b/plugins/exchange-account-setup/exchange-ask-password.c
index 212d2a89a6..46fe489258 100644
--- a/plugins/exchange-account-setup/exchange-ask-password.c
+++ b/plugins/exchange-account-setup/exchange-ask-password.c
@@ -70,7 +70,7 @@ validate_exchange_user (void *data)
CamelProviderValidate *validate;
CamelURL *url=NULL;
CamelProvider *provider = NULL;
- gboolean valid = TRUE;
+ gboolean valid = FALSE;
char *account_url, *url_string;
const char *source_url;
static int count = 0;
@@ -105,10 +105,9 @@ validate_exchange_user (void *data)
}
}
- validate->validate_user (url, owa_entry_text, NULL);
+ valid = validate->validate_user (url, owa_entry_text, NULL);
}
- else
- valid = FALSE;
+
/* FIXME: need to check for return value */
if (valid) {
count ++;
@@ -118,6 +117,7 @@ validate_exchange_user (void *data)
e_account_set_string (target_account->account,
E_ACCOUNT_TRANSPORT_URL, url_string);
}
+
camel_url_free (url);
g_free (account_url);
return valid;