add an argument to say whether or not you want "PLAIN" in the list (so you

	* camel-sasl.c (camel_sasl_authtype_list): add an argument to say
	whether or not you want "PLAIN" in the list (so you don't end up
	with "Password" twice in the config dialog).

	* providers/imap/camel-imap-provider.c (camel_provider_module_init):
	* providers/imap/camel-imap-store.c (query_auth_types): We don't
	want PLAIN.

	* providers/smtp/camel-smtp-provider.c (camel_provider_module_init):
	* providers/smtp/camel-smtp-transport.c (query_auth_types): But we
	do.

svn path=/trunk/; revision=8972

4 files changed, 4 insertions, 4 deletions

diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index 768c97901d..ce4f30487e 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -90,7 +90,7 @@ camel_provider_module_init (CamelSession *session)
 		camel_imap_store_get_type ();
 	imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
 	imap_provider.authtypes = g_list_concat (camel_remote_store_authtype_list (),
-						 camel_sasl_authtype_list ());
+						 camel_sasl_authtype_list (FALSE));
 	imap_provider.authtypes = g_list_prepend (imap_provider.authtypes,
 						  &camel_imap_password_authtype);
 
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 7f303e51fb..d9466e120e 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -321,7 +321,7 @@ query_auth_types (CamelService *service, CamelException *ex)
 	if (camel_exception_is_set (ex))
 		return types;
 
-	sasl_types = camel_sasl_authtype_list ();
+	sasl_types = camel_sasl_authtype_list (FALSE);
 	for (t = sasl_types; t; t = next) {
 		authtype = t->data;
 		next = t->next;
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index bcdc1bc3e0..96cba49594 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -51,7 +51,7 @@ camel_provider_module_init (CamelSession *session)
 {
 	smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
 		camel_smtp_transport_get_type ();
-	smtp_provider.authtypes = camel_sasl_authtype_list ();
+	smtp_provider.authtypes = camel_sasl_authtype_list (TRUE);
 	smtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
 
 	camel_session_register_provider (session, &smtp_provider);
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 1e345e3371..8b49aaa2f0 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -488,7 +488,7 @@ query_auth_types (CamelService *service, CamelException *ex)
 	if (!smtp_connect (service, ex))
 		return NULL;
 	
-	types = camel_sasl_authtype_list ();
+	types = camel_sasl_authtype_list (TRUE);
 	for (t = types; t; t = next) {
 		authtype = t->data;
 		next = t->next;