evolution-exchange r1707 - in trunk: . camel storage

[mcrha svn gnome org]

Author: mcrha
Date: Wed Jul 30 10:42:42 2008
New Revision: 1707
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1707&view=rev

Log:
2008-07-30  Milan Crha  <mcrha redhat com>

	** Fix for bug #500389

	* camel/camel-exchange-provider.c: (auth_types),
	(exchange_conf_entries), (camel_provider_module_init):
	Option to set different authentication type for GAL and OWA.
	* storage/exchange-autoconfig-wizard.c: (gc_page_next):
	Use default (NTLM, if failed then Plaintext) authentication here.

Note: Requires EDS revision 9230 and EVO revision 35866 or better.


Modified:
   trunk/ChangeLog
   trunk/camel/camel-exchange-provider.c
   trunk/storage/exchange-autoconfig-wizard.c

Modified: trunk/camel/camel-exchange-provider.c
==============================================================================
--- trunk/camel/camel-exchange-provider.c	(original)
+++ trunk/camel/camel-exchange-provider.c	Wed Jul 30 10:42:42 2008
@@ -51,6 +51,13 @@
 
 #endif
 
+static const char *auth_types[] = {
+	N_("Secure or Plaintext Password"),
+	N_("Plaintext Password"),
+	N_("Secure Password"),
+	NULL 
+};
+
 CamelProviderConfEntry exchange_conf_entries[] = {
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,
 	  N_("Checking for New Mail") },
@@ -75,6 +82,8 @@
 	  N_("_Global Catalog server name:") },
 	{ CAMEL_PROVIDER_CONF_CHECKSPIN, "ad_limit", NULL,
 	  N_("_Limit number of GAL responses: %s"), "y:1:500:10000" },
+	{ CAMEL_PROVIDER_CONF_OPTIONS, "ad_auth", NULL,
+	  N_("Authentication _Type:"), "default:Secure or Plaintext Password:basic:Plaintext Password:ntlm:Secure Password" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "generals", NULL,
 	  N_("Options") },
@@ -155,6 +164,8 @@
 void
 camel_provider_module_init (void)
 {
+	int i;
+
 	exchange_provider.object_types[CAMEL_PROVIDER_STORE] = camel_exchange_store_get_type ();
 	exchange_provider.object_types[CAMEL_PROVIDER_TRANSPORT] = camel_exchange_transport_get_type ();
 	exchange_provider.authtypes = g_list_prepend (g_list_prepend (NULL, &camel_exchange_password_authtype), &camel_exchange_ntlm_authtype);
@@ -167,6 +178,11 @@
 	exchange_provider.translation_domain = GETTEXT_PACKAGE;
 	exchange_provider.translation_domain = GETTEXT_PACKAGE;
 
+	/* 'auth_types' is not used anywhere else, it's there just for localization of the 'al_auth' */
+	for (i = 0; auth_types [i]; i++) {
+		auth_types [i] = _(auth_types [i]);
+	}
+
 	camel_provider_register (&exchange_provider);
 }
 

Modified: trunk/storage/exchange-autoconfig-wizard.c
==============================================================================
--- trunk/storage/exchange-autoconfig-wizard.c	(original)
+++ trunk/storage/exchange-autoconfig-wizard.c	Wed Jul 30 10:42:42 2008
@@ -335,7 +335,7 @@
 {
 	E2kAutoconfigResult result;
 
-	e2k_autoconfig_set_gc_server (gui->ac, gtk_entry_get_text (gui->gc_server_entry), -1);
+	e2k_autoconfig_set_gc_server (gui->ac, gtk_entry_get_text (gui->gc_server_entry), -1, E2K_AUTOCONFIG_USE_GAL_DEFAULT);
 
 	gtk_widget_set_sensitive (GTK_WIDGET (gui->window), FALSE);
 	e2k_operation_init (&gui->op);