Kill off a long-hated Camel kludge: "empty" URLs and

	query_auth_types_generic.

	* camel-url.c: Remove "empty" from CamelURL.
	(camel_url_new): No longer set it.
	(camel_url_to_string): Treat "" as equivalent to NULL for
	authmech. (Unrelated change, but it simplifies some stuff with the
	new config dialog.)

	* camel-service.c (camel_service_new): Remove url->empty check: if
	the URL isn't valid, we don't create the service.
	(camel_service_query_auth_types): No longer need to switch between
	generic and connected variants.

	* providers/smtp/camel-smtp-transport.c (query_auth_types):
	* providers/pop3/camel-pop3-store.c (query_auth_types):
	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types):
	* providers/imap/camel-imap-store.c (query_auth_types):
	* camel-remote-store.c (remote_query_auth_types): Remove generic
	version, rename connected version.

svn path=/trunk/; revision=7327

1 files changed, 2 insertions, 6 deletions

diff --git a/camel/camel-url.c b/camel/camel-url.c
index 18575782dc..337243bb55 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -59,9 +59,6 @@
  *
  * The port, if present, must be numeric.
  * 
- * If nothing but the protocol (and the ":") is present, the "empty"
- * flag will be set on the returned URL.
- *
  * Return value: a CamelURL structure containing the URL items.
  **/
 CamelURL *
@@ -101,8 +98,7 @@ camel_url_new (const char *url_string, CamelException *ex)
 		if (*(colon + 1)) {
 			url->path = g_strdup (colon + 1);
 			camel_url_decode (url->path);
-		} else
-			url->empty = TRUE;
+		}
 		return url;
 	}
 
@@ -185,7 +181,7 @@ camel_url_to_string (CamelURL *url, gboolean show_passwd)
 	if (url->user)
 		user = camel_url_encode (url->user, TRUE, ":;@/");
 	
-	if (url->authmech)
+	if (url->authmech && *url->authmech)
 		authmech = camel_url_encode (url->authmech, TRUE, ":@/");
 	
 	if (show_passwd && url->passwd)