From 9236ecd8e816336d4ec7c4181c9cc31d881ebf05 Mon Sep 17 00:00:00 2001 From: Sankar P Date: Mon, 12 Jun 2006 11:27:17 +0000 Subject: org-gnome-proxy-login-errors.xml: Handled error case to not allow proxy 2006-06-12 Sankar P * proxy-login.c: org-gnome-proxy-login-errors.xml: Handled error case to not allow proxy login to the same account more than once. Fixes #340535 svn path=/trunk/; revision=32111 --- plugins/groupwise-features/ChangeLog | 6 ++++++ plugins/groupwise-features/org-gnome-proxy-login-errors.xml | 7 ++++++- plugins/groupwise-features/proxy-login.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 424c1d45bc..78d904be7b 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,9 @@ +2006-06-12 Sankar P + + * proxy-login.c: org-gnome-proxy-login-errors.xml: + Handled error case to not allow proxy login to the same account + more than once. Fixes #340535 + 2006-05-31 David Richards * proxy-login-dialog.glade: diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml index d330f85287..69b3cd562d 100644 --- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml @@ -6,5 +6,10 @@ Proxy login as "{0}" was unsuccessful. Please check Email Id and try again. - + + Account Already Exists + Account "{0}" already exists. Please check your folder tree. + + + diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 3d39c3bc18..5dd2bf0c3c 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -335,6 +335,15 @@ proxy_soap_login (char *email) e_error_run (NULL, "org.gnome.evolution.proxy-login:invalid-user",email ,NULL); return; } + + /* README: There should not be the weird scenario of the proxy itself configured as an account. + If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/ + + if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) { + e_error_run (NULL, "org.gnome.evolution.proxy-login:already-loggedin", email, NULL); + g_free (name); + return; + } srcAccount = pld->account; cnc = proxy_login_get_cnc(srcAccount); -- cgit v1.2.3