X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-utils.c;h=8507fd5bf952acfaf027083d299ec0770bbd3694;hb=8ad36d3e8950c17e87ec346f1afed9a2eb1a8c6e;hp=3080b67b91ac88d6cb3558ea27026486b0d441a5;hpb=d4bf1f13cff4590e5a9ad637e4c15fe61d4ba4be;p=modest

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 3080b67..8507fd5 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -71,7 +71,7 @@ modest_utils_folder_writable (const gchar *filename)
 	if (!filename)
 		return FALSE;
 
-	if (g_strncasecmp (filename, "obex", 4) != 0) {
+	if (g_ascii_strncasecmp (filename, "obex", 4) != 0) {
 		GnomeVFSFileInfo *folder_info = NULL;
 		GnomeVFSResult result = GNOME_VFS_OK;
 		GnomeVFSURI *uri = NULL;
@@ -106,16 +106,16 @@ modest_utils_folder_writable (const gchar *filename)
 gboolean
 modest_utils_file_exists (const gchar *filename)
 {
-	GnomeVFSURI *uri = NULL;
 	gboolean result = FALSE;
+	gchar *escaped;
 
 	g_return_val_if_fail (filename, FALSE);
 
-	uri = gnome_vfs_uri_new (filename);
-	if (uri) {
-		result = gnome_vfs_uri_exists (uri);
-		gnome_vfs_uri_unref (uri);
-	}
+	escaped = g_uri_escape_string (filename, NULL, FALSE);
+	if (g_access (escaped, F_OK) == 0)
+		result = TRUE;
+	g_free (escaped);
+
 	return result;
 }
 
@@ -124,7 +124,7 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 {
 	gint fd;
 	gchar *filepath = NULL;
-	gchar *tmpdir;
+	gchar *tmpdir, *tmp;
 	guint hash_number;
 
 	/* hmmm... maybe we need a modest_text_utils_validate_file_name? */
@@ -156,15 +156,16 @@ modest_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base,
 		return NULL;
 	}
 
-	filepath = g_strconcat (tmpdir, "/", orig_name, NULL);
+	tmp = g_uri_escape_string (orig_name, NULL, FALSE);
+	filepath = g_build_filename (tmpdir, tmp, NULL);
+	g_free (tmp);
 
 	/* if file exists, first we try to remove it */
-	if (modest_utils_file_exists (filepath)) {
+	if (g_access (filepath, F_OK) == 0)
 		g_unlink (filepath);
-	}
 
 	/* don't overwrite if it already exists, even if it is writable */
-	if (modest_utils_file_exists (filepath)) {
+	if (g_access (filepath, F_OK) == 0) {
 		if (path!=NULL) {
 			*path = filepath;
 		} else {