aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/imap/camel-imap-folder.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-07-15 07:32:04 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-07-15 07:32:04 +0800
commitda95cb001269e87eb4830227db6fa362909e712f (patch)
tree97d947612e21c8b03fed8b79b6568d0bb048a046 /camel/providers/imap/camel-imap-folder.c
parent6746c025d5cdb4cd8f49b7bc3e339aa956b3d7c9 (diff)
downloadgsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar.gz
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar.bz2
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar.lz
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar.xz
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.tar.zst
gsoc2013-evolution-da95cb001269e87eb4830227db6fa362909e712f.zip
New convenience function to unquote a string if it's encapsulated by "'s
2000-07-14 Jeffrey Stedfast <fejj@helixcode.com> * string-utils.c (string_unquote): New convenience function to unquote a string if it's encapsulated by "'s * providers/imap/camel-imap-folder.c: * providers/imap/camel-imap-store.c: Made the necessary changes to stop using hard coded directory separators. svn path=/trunk/; revision=4170
Diffstat (limited to 'camel/providers/imap/camel-imap-folder.c')
-rw-r--r--camel/providers/imap/camel-imap-folder.c43
1 files changed, 28 insertions, 15 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index f1e2365dcb..f52134585b 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -224,7 +224,7 @@ imap_init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_fo
CamelStore *store = CAMEL_STORE (parent_store);
CamelURL *url = CAMEL_SERVICE (store)->url;
int status;
- char *result, *folder_path;
+ char *result, *folder_path, *dir_sep;
/* call parent method */
parent_class->init (folder, parent_store, parent_folder, name, separator, path_begins_with_sep, ex);
@@ -253,8 +253,10 @@ imap_init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_fo
imap_folder->summary = NULL;
/* SELECT the IMAP mail spool */
+ dir_sep = CAMEL_IMAP_STORE (folder->parent_store)->dir_sep;
+
if (url && url->path && *(url->path + 1) && strcmp (folder->full_name, "INBOX"))
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, folder->full_name);
else
folder_path = g_strdup (folder->full_name);
@@ -409,7 +411,7 @@ imap_get_message_count (CamelFolder *folder, CamelException *ex)
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
CamelStore *store = CAMEL_STORE (folder->parent_store);
CamelURL *url = CAMEL_SERVICE (store)->url;
- gchar *result, *msg_count, *folder_path;
+ gchar *result, *msg_count, *folder_path, *dir_sep;
gint status;
g_return_val_if_fail (folder != NULL, -1);
@@ -418,8 +420,10 @@ imap_get_message_count (CamelFolder *folder, CamelException *ex)
if (imap_folder->count != -1)
return imap_folder->count;
+ dir_sep = CAMEL_IMAP_STORE (folder->parent_store)->dir_sep;
+
if (url && url->path && *(url->path + 1) && strcmp (folder->full_name, "INBOX"))
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, folder->full_name);
else
folder_path = g_strdup (folder->full_name);
@@ -486,7 +490,7 @@ imap_append_message (CamelFolder *folder, CamelMimeMessage *message, guint32 fla
CamelStore *store = CAMEL_STORE (folder->parent_store);
CamelURL *url = CAMEL_SERVICE (store)->url;
CamelStreamMem *mem;
- gchar *result, *folder_path, *flagstr = NULL;
+ gchar *result, *folder_path, *dir_sep, *flagstr = NULL;
gint status;
g_return_if_fail (folder != NULL);
@@ -505,9 +509,11 @@ imap_append_message (CamelFolder *folder, CamelMimeMessage *message, guint32 fla
}
mem->buffer = g_byte_array_append (mem->buffer, g_strdup ("\r\n"), 3);
+
+ dir_sep = CAMEL_IMAP_STORE (folder->parent_store)->dir_sep;
if (url && url->path && *(url->path + 1) && strcmp (folder->full_name, "INBOX"))
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, folder->full_name);
else
folder_path = g_strdup (folder->full_name);
@@ -552,11 +558,13 @@ imap_copy_message_to (CamelFolder *source, const char *uid, CamelFolder *destina
{
CamelStore *store = CAMEL_STORE (source->parent_store);
CamelURL *url = CAMEL_SERVICE (store)->url;
- char *result, *folder_path;
+ char *result, *folder_path, *dir_sep;
int status;
+
+ dir_sep = CAMEL_IMAP_STORE (source->parent_folder)->dir_sep;
if (url && url->path && *(url->path + 1) && strcmp (destination->full_name, "INBOX"))
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, destination->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, destination->full_name);
else
folder_path = g_strdup (destination->full_name);
@@ -588,11 +596,13 @@ imap_move_message_to (CamelFolder *source, const char *uid, CamelFolder *destina
CamelStore *store = CAMEL_STORE (source->parent_store);
CamelURL *url = CAMEL_SERVICE (store)->url;
CamelMessageInfo *info;
- char *result, *folder_path;
+ char *result, *folder_path, *dir_sep;
int status;
+
+ dir_sep = CAMEL_IMAP_STORE (source->parent_store)->dir_sep;
if (url && url->path && *(url->path + 1) && strcmp (destination->full_name, "INBOX"))
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, destination->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, destination->full_name);
else
folder_path = g_strdup (destination->full_name);
@@ -685,6 +695,7 @@ imap_parse_subfolder_line (gchar *buf, gchar **flags, gchar **sep, gchar **folde
ptr = eptr + 1;
*folder = g_strdup (ptr);
g_strstrip (*folder);
+ string_unquote (*folder); /* unquote the mailbox if it's quoted */
return TRUE;
}
@@ -697,25 +708,27 @@ imap_get_subfolder_names (CamelFolder *folder, CamelException *ex)
CamelURL *url = CAMEL_SERVICE (store)->url;
GPtrArray *listing;
gint status;
- gchar *result, *folder_path;
+ gchar *result, *folder_path, *dir_sep;
- g_return_val_if_fail (folder != NULL, g_ptr_array_new());
+ g_return_val_if_fail (folder != NULL, g_ptr_array_new ());
if (imap_folder->count != -1)
return g_ptr_array_new ();
+ dir_sep = CAMEL_IMAP_STORE (folder->parent_store)->dir_sep;
+
if (url && url->path) {
if (!strcmp (folder->full_name, "INBOX"))
folder_path = g_strdup (url->path + 1);
else
- folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ folder_path = g_strdup_printf ("%s%s%s", url->path + 1, dir_sep, folder->full_name);
} else {
folder_path = g_strdup (folder->full_name);
}
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
- &result, "LIST \"\" \"%s%s\"", folder_path,
- *folder_path ? "/*" : "*");
+ &result, "LIST \"\" \"%s%s*\"", folder_path,
+ *folder_path ? dir_sep : "");
if (status != CAMEL_IMAP_OK) {
CamelService *service = CAMEL_SERVICE (folder->parent_store);