From: Timo Sirainen <tss@iki.fi>
Date: Sun, 27 Jul 2003 05:37:13 +0000 (+0300)
Subject: fixes
X-Git-Tag: 1.1.alpha1~4451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ff4bc25c29160e24339205ce36c9d2d96e7e1ff;p=thirdparty%2Fdovecot%2Fcore.git

fixes

--HG--
branch : HEAD
---

diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index e08758dada..0366d46386 100644
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -6,6 +6,7 @@
 #include "imap-quote.h"
 #include "imap-match.h"
 #include "commands.h"
+#include "namespace.h"
 
 static const char *mailbox_flags2str(enum mailbox_flags flags, int listext)
 {
@@ -99,9 +100,8 @@ int _cmd_list_full(struct client *client, int lsub)
 	char sep_chr, sep[3];
 	int failed, listext;
 
-	storage = client_find_storage(client, "");
-	if (storage == NULL)
-		return TRUE;
+	/* FIXME: really needs some work.. */
+	storage = client->namespaces->storage;
 
 	sep_chr = storage->hierarchy_sep;
 	if (sep_chr == '"' || sep_chr == '\\') {
diff --git a/src/imap/cmd-rename.c b/src/imap/cmd-rename.c
index af6777e909..3b63e76b19 100644
--- a/src/imap/cmd-rename.c
+++ b/src/imap/cmd-rename.c
@@ -25,7 +25,7 @@ int cmd_rename(struct client *client)
 
 	if (old_storage != new_storage) {
 		client_send_tagline(client,
-			"NO Can't rename mailbox to another namespace.");
+			"NO Can't rename mailbox to another storage type.");
 		return TRUE;
 	}