dovecot-2.2: lazy-expunge: Fixed handling non-default namespace ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/4e431b202cfd
changeset: 15280:4e431b202cfd
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Sep 26 21:12:37 2012 +0300
description:
lazy-expunge: Fixed handling non-default namespace separator.

diffstat:

 src/plugins/lazy-expunge/lazy-expunge-plugin.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 4d82c74f702c -r 4e431b202cfd src/plugins/lazy-expunge/lazy-expunge-plugin.c
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Mon Sep 24 17:03:42 2012 +0300
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c	Wed Sep 26 21:12:37 2012 +0300
@@ -70,11 +70,11 @@
 	const char *name;
 	char src_sep, dest_sep;
 
-	/* get the storage name, so it doesn't have namespace prefix */
+	/* use the (canonical / unaliased) storage name */
 	name = src_box->name;
-	/* replace hierarchy separators with destination separator */
+	/* replace hierarchy separators with destination virtual separator */
 	src_sep = mailbox_list_get_hierarchy_sep(src_box->list);
-	dest_sep = mailbox_list_get_hierarchy_sep(list);
+	dest_sep = mail_namespace_get_sep(list->ns);
 	if (src_sep != dest_sep) {
 		string_t *str = t_str_new(128);
 		unsigned int i;
@@ -87,7 +87,7 @@
 		}
 		name = str_c(str);
 	}
-	/* add expunge namespace prefix */
+	/* add expunge namespace prefix. the name is now a proper vname */
 	name = t_strconcat(list->ns->prefix, name, NULL);
 
 	box = mailbox_alloc(list, name, MAILBOX_FLAG_NO_INDEX_FILES);