[evolution] Bug #494047 - Unescape uris in composer's Post-To

[Milan Crha <mcrha src gnome org>]

commit 24a269487823900e491cafd76af2c973f34898fb
Author: Milan Crha <mcrha redhat com>
Date:   Mon Apr 19 13:18:50 2010 +0200

    Bug #494047 - Unescape uris in composer's Post-To

 composer/e-composer-post-header.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 7fd26aa..5bace17 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -45,16 +45,26 @@ static gchar *
 composer_post_header_folder_name_to_string (EComposerPostHeader *header,
                                             const gchar *url)
 {
+	gchar *res = NULL;
 	const gchar *base_url = header->priv->base_url;
 
 	if (base_url != NULL) {
 		gsize length = strlen (base_url);
 
-		if (g_ascii_strncasecmp (url, base_url, length) == 0)
-			return g_strdup (url + length);
+		if (g_ascii_strncasecmp (url, base_url, length) == 0) {
+			res = g_uri_unescape_string (url + length, NULL);
+			if (!res)
+				res = g_strdup (url + length);
+		}
+	} 
+
+	if (!res) {
+		res = g_uri_unescape_string (url, NULL);
+		if (!res)
+			res = g_strdup (url);
 	}
 
-	return g_strdup (url);
+	return res;
 }
 
 static void