change "gboolean show_passwd" to "guint32 flags".

	* camel-url.c (camel_url_to_string): change "gboolean show_passwd"
	to "guint32 flags".

	* tests/misc/url.c (main): Update calls to camel_url_to_string

	* providers/imap/camel-imap-store.c (construct): Call
	camel_url_to_string with flags to hide password, authtype, and
	params to create the base_url.
	(etc): Update for the fact that the base_url no longer has the "/"
	at the end.

	* camel-service.c (construct): Update calls to camel_url_to_string
	(pass CAMEL_URL_HIDE_PASSWORD)

svn path=/trunk/; revision=9014

1 files changed, 4 insertions, 4 deletions

diff --git a/camel/camel-url.c b/camel/camel-url.c
index 28f913495d..535564f28e 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -292,12 +292,12 @@ camel_url_new (const char *url_string, CamelException *ex)
 /**
  * camel_url_to_string:
  * @url: a CamelURL
- * @show_password: whether or not to include the password in the output
+ * @flags: additional translation options.
  *
  * Return value: a string representing @url, which the caller must free.
  **/
 char *
-camel_url_to_string (CamelURL *url, gboolean show_passwd)
+camel_url_to_string (CamelURL *url, guint32 flags)
 {
 	GString *str;
 	char *enc, *return_result;
@@ -322,7 +322,7 @@ camel_url_to_string (CamelURL *url, gboolean show_passwd)
 			g_string_sprintfa (str, ";auth=%s", enc);
 			g_free (enc);
 		}
-		if (show_passwd && url->passwd) {
+		if (url->passwd && !(flags & CAMEL_URL_HIDE_PASSWORD)) {
 			enc = camel_url_encode (url->passwd, TRUE, "@/");
 			g_string_sprintfa (str, ":%s", enc);
 			g_free (enc);
@@ -342,7 +342,7 @@ camel_url_to_string (CamelURL *url, gboolean show_passwd)
 		g_string_sprintfa (str, "%s", enc);
 		g_free (enc);
 	}
-	if (url->params)
+	if (url->params && !(flags & CAMEL_URL_HIDE_PARAMS))
 		g_datalist_foreach (&url->params, output_param, str);
 	if (url->query) {
 		enc = camel_url_encode (url->query, FALSE, "#");