fixes

--HG--
branch : HEAD

diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index e08758dada76080c75eb24f9c7a9467d371a9229..0366d4638602074d7eaa3a1cf495803efaf516aa 100644 (file)
--- 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 af6777e90929cdf4e5795c6c87b510feea1aa549..3b63e76b19072f51ef4e88b30e677cb1f8e51ce9 100644 (file)
--- 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;
        }