X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-local-folder-info.c;h=d0bcb755a2b037e634dab43f260023222e28b7c4;hp=7f6a08ce229368ac0eb1e72b2c19e75f271b9ea9;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=0fdbbf3fb1f46a38a41104ae435e7e745fa5177f

diff --git a/src/modest-local-folder-info.c b/src/modest-local-folder-info.c
index 7f6a08c..d0bcb75 100644
--- a/src/modest-local-folder-info.c
+++ b/src/modest-local-folder-info.c
@@ -113,11 +113,22 @@ gchar*
 modest_per_account_local_outbox_folder_info_get_maildir_path (const gchar* account_name)
 {
 	/* This directory should contain an "outbox" child directory: */
-	return g_build_filename (g_get_home_dir(),
-				 MODEST_DIR,
-				 MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDERS_MAILDIR, 
-				 account_name,
-				 NULL);
+	gchar *escaped, *filename;
+
+#if GLIB_CHECK_VERSION(2, 16, 0)
+	escaped = g_uri_escape_string (account_name, NULL, FALSE);
+#else
+	/* TODO: escape without calling glib */
+	escaped = g_strdup (account_name);
+#endif
+	filename = g_build_filename (g_get_home_dir(),
+				     MODEST_DIR,
+				     MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDERS_MAILDIR, 
+				     escaped,
+				     NULL);
+	g_free (escaped);
+
+	return filename;
 }
 
 gchar*