From: Timo Sirainen <tss@iki.fi>
Date: Fri, 6 Aug 2010 17:58:17 +0000 (+0100)
Subject: listescape: Crashfix for listing subscriptions for subscriptions=no namespaces.
X-Git-Tag: 2.0.rc5~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1699c48b2e6d5bbf7ace21bebd6e9cf15e4b8fc9;p=thirdparty%2Fdovecot%2Fcore.git

listescape: Crashfix for listing subscriptions for subscriptions=no namespaces.
---

diff --git a/src/plugins/listescape/listescape-plugin.c b/src/plugins/listescape/listescape-plugin.c
index 7125b92b40..ae6a88f413 100644
--- a/src/plugins/listescape/listescape-plugin.c
+++ b/src/plugins/listescape/listescape-plugin.c
@@ -80,11 +80,10 @@ list_escape(struct mail_namespace *ns, const char *str, bool vname)
 	return str_c(esc);
 }
 
-static void list_unescape_str(struct mail_namespace *ns,
+static void list_unescape_str(struct listescape_mailbox_list *mlist,
+			      struct mail_namespace *ns,
 			      const char *str, string_t *dest)
 {
-	struct listescape_mailbox_list *mlist =
-		LIST_ESCAPE_LIST_CONTEXT(ns->list);
 	unsigned int num;
 
 	for (; *str != '\0'; str++) {
@@ -208,7 +207,7 @@ listescape_mailbox_list_iter_next(struct mailbox_list_iterate_context *ctx)
 
 	str_truncate(liter->name, 0);
 	str_append(liter->name, ns->prefix);
-	list_unescape_str(ns, info->name + ns->prefix_len, liter->name);
+	list_unescape_str(mlist, ns, info->name + ns->prefix_len, liter->name);
 	liter->info = *info;
 	liter->info.name = str_c(liter->name);
 	return &liter->info;