aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author0 <NotZed@Ximian.com>2001-10-30 13:23:43 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-10-30 13:23:43 +0800
commit41dea671f83b9e5914b91cb5f57e8a2268898b52 (patch)
tree2bcf7c02dac9bf8624c5e2f1ddd0e92f362072e3
parent6e4ce3ebfbe5d9f721e2d2d42e35d8e2b370f035 (diff)
downloadgsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar.gz
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar.bz2
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar.lz
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar.xz
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.tar.zst
gsoc2013-evolution-41dea671f83b9e5914b91cb5f57e8a2268898b52.zip
Oops, dont use the url storage path to offset the folder name we're
2001-10-30 <NotZed@Ximian.com> * mail-local.c (mls_rename_folder): Oops, dont use the url storage path to offset the folder name we're renaming/opening, etc. svn path=/trunk/; revision=14431
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-local.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 43c4b36c42..756de97834 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-10-30 <NotZed@Ximian.com>
+ * mail-local.c (mls_rename_folder): Oops, dont use the url storage
+ path to offset the folder name we're renaming/opening, etc.
+
* subscribe-dialog.c (fe_cancel_op_foreach): Argh!!! Dont free the
async op data here, the async op is still running and will access
it! Just try to cancel it and mark it as cancelled (id == -1)
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 9267878757..b072f90795 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -413,6 +413,8 @@ mlf_rename(CamelFolder *folder, const char *new)
if (mlf->real_folder) {
char *mbox = g_strdup_printf("%s/%s", new, mlf->meta->name);
+ d(printf("renaming real folder to %s\n", mbox));
+
camel_folder_rename(mlf->real_folder, mbox);
g_free(mbox);
}
@@ -850,8 +852,8 @@ mls_rename_folder(CamelStore *store, const char *old_name, const char *new_name,
return;
}
- oldname = g_strdup_printf("%s%s/%s", ((CamelService *)store)->url->path, old_name, meta->name);
- newname = g_strdup_printf("%s%s/%s", ((CamelService *)store)->url->path, new_name, meta->name);
+ oldname = g_strdup_printf("%s/%s", old_name, meta->name);
+ newname = g_strdup_printf("%s/%s", new_name, meta->name);
camel_store_rename_folder(real_store, oldname, newname, ex);
if (!camel_exception_is_set(ex)) {