aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSarfraaz Ahmed <asarfraaz@novell.com>2005-07-01 13:49:51 +0800
committerAhmed Sarfraaz <sarfraaz@src.gnome.org>2005-07-01 13:49:51 +0800
commit10c14aa014cc7d9f324f914c895823f1a202d988 (patch)
treef05badf75b9ec733e7a61f8d1f106544e916fa26 /plugins
parenta9edef00dd65010d4e08517d861ea55992bd863d (diff)
downloadgsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar.gz
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar.bz2
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar.lz
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar.xz
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.tar.zst
gsoc2013-evolution-10c14aa014cc7d9f324f914c895823f1a202d988.zip
Added new. This prints the validation error string.
2005-07-01 Sarfraaz Ahmed <asarfraaz@novell.com> * exchange-account-setup.c(print_error) : Added new. This prints the validation error string. (owa_authenticate_user) : Fetch the error code from validate and handle the printing of error strings in the plugin. * exchange-config-listener.c (account_added) : For now add the sources before connect to avoid multiple esources. Should be fixed more elegantly. svn path=/trunk/; revision=29607
Diffstat (limited to 'plugins')
-rw-r--r--plugins/exchange-operations/ChangeLog10
-rw-r--r--plugins/exchange-operations/exchange-account-setup.c117
-rw-r--r--plugins/exchange-operations/exchange-config-listener.c2
3 files changed, 116 insertions, 13 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 098d7e118b..e00832f25d 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-01 Sarfraaz Ahmed <asarfraaz@novell.com>
+
+ * exchange-account-setup.c(print_error) : Added new. This prints the
+ validation error string.
+ (owa_authenticate_user) : Fetch the error code from validate and handle
+ the printing of error strings in the plugin.
+ * exchange-config-listener.c (account_added) : For now add the sources
+ before connect to avoid multiple esources. Should be fixed more
+ elegantly.
+
2005-06-27 Sarfraaz Ahmed <asarfraaz@novell.com>
* Makefile.am : Added the header files as part of SOURCES so that they
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index dd35d7dcbf..daae054a2f 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -53,15 +53,6 @@ gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData
GtkWidget *org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data);
void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
-/* NB: This should be given a better name, it is NOT a camel service, it is only a camel-exchange one */
-typedef gboolean (CamelProviderValidateUserFunc) (CamelURL *camel_url, const char *url, gboolean *remember_password, CamelException *ex);
-
-#define OOF_INFO_FILE_NAME "oof_info.xml"
-
-typedef struct {
- CamelProviderValidateUserFunc *validate_user;
-}CamelProviderValidate;
-
CamelServiceAuthType camel_exchange_ntlm_authtype = {
/* i18n: "Secure Password Authentication" is an Outlookism */
N_("Secure Password"),
@@ -370,13 +361,111 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
}
static void
+print_error (const char *owa_url, E2kAutoconfigResult result)
+{
+ char *old, *new;
+
+ switch (result) {
+
+ case E2K_AUTOCONFIG_CANT_CONNECT:
+ if (!strncmp (owa_url, "http:", 5)) {
+ old = "http";
+ new = "https";
+ } else {
+ old = "https";
+ new = "http";
+ }
+
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not connect to the Exchange "
+ "server.\nMake sure the URL is correct "
+ "(try \"%s\" instead of \"%s\"?) "
+ "and try again."), new, old);
+ */
+ break;
+
+ case E2K_AUTOCONFIG_CANT_RESOLVE:
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not locate Exchange server.\n"
+ "Make sure the server name is spelled correctly "
+ "and try again."));
+ */
+ break;
+
+ case E2K_AUTOCONFIG_AUTH_ERROR:
+ case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM:
+ case E2K_AUTOCONFIG_AUTH_ERROR_TRY_BASIC:
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not authenticate to the Exchange "
+ "server.\nMake sure the username and "
+ "password are correct and try again."));
+ */
+ break;
+
+ case E2K_AUTOCONFIG_AUTH_ERROR_TRY_DOMAIN:
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not authenticate to the Exchange "
+ "server.\nMake sure the username and "
+ "password are correct and try again.\n\n"
+ "You may need to specify the Windows "
+ "domain name as part of your username "
+ "(eg, \"MY-DOMAIN\\%s\")."),
+ ac->username);
+ */
+ break;
+
+ case E2K_AUTOCONFIG_NO_OWA:
+ case E2K_AUTOCONFIG_NOT_EXCHANGE:
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not find OWA data at the indicated URL.\n"
+ "Make sure the URL is correct and try again."));
+ */
+ break;
+
+ case E2K_AUTOCONFIG_CANT_BPROPFIND:
+ /* SURF : e_notice (
+ NULL, GTK_MESSAGE_ERROR,
+ _("Ximian Connector requires access to certain "
+ "functionality on the Exchange Server that appears "
+ "to be disabled or blocked. (This is usually "
+ "unintentional.) Your Exchange Administrator will "
+ "need to enable this functionality in order for "
+ "you to be able to use Ximian Connector.\n\n"
+ "For information to provide to your Exchange "
+ "administrator, please follow the link below:\n"
+ "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html "));
+ */
+ break;
+
+ case E2K_AUTOCONFIG_EXCHANGE_5_5:
+ /* SURF : e_notice (
+ NULL, GTK_MESSAGE_ERROR,
+ _("The Exchange server URL you provided is for an "
+ "Exchange 5.5 Server. Ximian Connector supports "
+ "Microsoft Exchange 2000 and 2003 only."));
+ */
+ break;
+
+ default:
+ /* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
+ _("Could not configure Exchange account because "
+ "an unknown error occurred. Check the URL, "
+ "username, and password, and try again."));
+ */
+ break;
+
+ }
+}
+
+static void
owa_authenticate_user(GtkWidget *button, EConfig *config)
{
EMConfigTargetAccount *target_account = (EMConfigTargetAccount *)config->target;
+ E2kAutoconfigResult result;
CamelURL *url=NULL;
gboolean remember_password;
char *url_string;
- const char *source_url, *id_name;
+ const char *source_url, *id_name, *owa_url;
char *at, *user;
gboolean valid = FALSE;
ExchangeParams *exchange_params;
@@ -410,8 +499,12 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
It must use camel_session_ask_password, and it should return an exception for any problem,
which should then be shown using e-error */
- valid = e2k_validate_user ((const char *)camel_url_get_param (url, "owa_url"),
- url->user, exchange_params, &remember_password);
+ owa_url = camel_url_get_param (url, "owa_url");
+ valid = e2k_validate_user (owa_url, url->user, exchange_params,
+ &remember_password, &result);
+
+ if (!valid)
+ print_error (owa_url, result);
camel_url_set_host (url, valid ? exchange_params->host : "");
if (valid)
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 1a114b6baf..6808931624 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -817,8 +817,8 @@ account_added (EAccountList *account_list, EAccount *account)
g_signal_emit (config_listener, signals[EXCHANGE_ACCOUNT_CREATED], 0,
exchange_account);
- exchange_account_connect (exchange_account);
add_sources (exchange_account);
+ exchange_account_connect (exchange_account);
}
struct account_update_data {