diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-03 04:47:36 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-03 04:47:36 +0000 |
commit | 9cb5a32884a874d7143fdb846871a2083fe9e022 (patch) | |
tree | 044fad24b05a550d20004af2c843f9987c7a6a7c /libsylph/imap.c | |
parent | 98caa484e62a5e9c506c5e0a489701bcabca8c52 (diff) |
win32: fixed a bug that the path separator of FolderItem::path was not processed correctly.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1589 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph/imap.c')
-rw-r--r-- | libsylph/imap.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/libsylph/imap.c b/libsylph/imap.c index caff7255..bcac6355 100644 --- a/libsylph/imap.c +++ b/libsylph/imap.c @@ -1368,15 +1368,13 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, GSList *msglist, if (remove_source) { status_print(_("Moving messages %s to %s ..."), seq_set, dest->path); - debug_print("Moving message %s%c[%s] to %s ...\n", - src->path, G_DIR_SEPARATOR, - seq_set, dest->path); + debug_print("Moving message %s/[%s] to %s ...\n", + src->path, seq_set, dest->path); } else { status_print(_("Copying messages %s to %s ..."), seq_set, dest->path); - debug_print("Copying message %s%c[%s] to %s ...\n", - src->path, G_DIR_SEPARATOR, - seq_set, dest->path); + debug_print("Copying message %s/[%s] to %s ...\n", + src->path, seq_set, dest->path); } progress_show(count, total); ui_update(); @@ -2207,8 +2205,7 @@ static gint imap_rename_folder_real(Folder *folder, FolderItem *item, if (name) { if (new_parent->path) newpath = g_strconcat(new_parent->path, - G_DIR_SEPARATOR_S, name, - NULL); + "/", name, NULL); else newpath = g_strdup(name); } else { @@ -2217,20 +2214,18 @@ static gint imap_rename_folder_real(Folder *folder, FolderItem *item, name_ = g_path_get_basename(item->path); if (new_parent->path) newpath = g_strconcat(new_parent->path, - G_DIR_SEPARATOR_S, name_, - NULL); + "/", name_, NULL); else newpath = g_strdup(name_); AUTORELEASE_STR(name_, ); name = name_; } } else { - if (strchr(item->path, G_DIR_SEPARATOR)) { + if (strchr(item->path, '/')) { gchar *dirpath; dirpath = g_dirname(item->path); - newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, - NULL); + newpath = g_strconcat(dirpath, "/", name, NULL); g_free(dirpath); } else newpath = g_strdup(name); @@ -4390,12 +4385,11 @@ static gboolean imap_rename_folder_func(GNode *node, gpointer data) } base = item->path + oldpathlen; - while (*base == G_DIR_SEPARATOR) base++; + while (*base == '/') base++; if (*base == '\0') new_itempath = g_strdup(newpath); else - new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base, - NULL); + new_itempath = g_strconcat(newpath, "/", base, NULL); g_free(item->path); item->path = new_itempath; |