aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorFridrich Strba <FStrba@novell.com>2009-05-04 13:18:31 +0800
committerBharath Acharya <abharath@novell.com>2009-05-04 13:18:31 +0800
commitf4ecf2d62fd8766fa0b0c7d6483d9a583459267c (patch)
tree2b86f2c18979c8310af759dbab98c1d36d1b8274 /mail
parentfcb97c2bd7c70c711e4ca201eacb871a34a07bf7 (diff)
downloadgsoc2013-evolution-f4ecf2d62fd8766fa0b0c7d6483d9a583459267c.tar.gz
gsoc2013-evolution-f4ecf2d62fd8766fa0b0c7d6483d9a583459267c.tar.zst
gsoc2013-evolution-f4ecf2d62fd8766fa0b0c7d6483d9a583459267c.zip
Assure that the filename <-> uri conversion are done with g_filename_{to,from}_uri and not by concatenating strings which is broken with win32-style uris
Diffstat (limited to 'mail')
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--mail/mail-ops.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 1fa58096ce..f20af59683 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -788,7 +788,7 @@ efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay *
if (img_url) {
if (!(strstr (img_url, "://") || g_ascii_strncasecmp (img_url, "cid:", 4) == 0)) {
- char *u = g_strconcat ("file://", img_url, NULL);
+ char *u = g_filename_to_uri (img_url, NULL, NULL);
g_free (img_url);
img_url = u;
}
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 0eb6c9414c..a8aa14d278 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2062,7 +2062,7 @@ save_messages_exec (struct _save_messages_msg *m)
if (strstr (m->path, "://"))
path = m->path;
else
- path = g_strjoin (NULL, "file://", m->path, NULL);
+ path = g_filename_to_uri (m->path, NULL, NULL);
stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE);
from_filter = camel_mime_filter_from_new();
@@ -2176,7 +2176,7 @@ save_part_exec (struct _save_part_msg *m)
if (strstr (m->path, "://"))
path = m->path;
else
- path = g_strjoin (NULL, "file://", m->path, NULL);
+ path = g_filename_to_uri (m->path, NULL, NULL);
if(!m->readonly){
if (!(stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE))) {