Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9282:9fe57d8ec946 HEAD
imap: Fixed tb-extra-mailbox-sep workeround.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 04 Aug 2009 14:27:29 -0400 |
parents | 3a25f14abf12 |
children | 0de21e725d4e |
files | src/imap/cmd-delete.c src/imap/cmd-subscribe.c |
diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/cmd-delete.c Mon Aug 03 12:54:21 2009 -0400 +++ b/src/imap/cmd-delete.c Tue Aug 04 14:27:29 2009 -0400 @@ -2,10 +2,12 @@ #include "common.h" #include "commands.h" +#include "mail-namespace.h" bool cmd_delete(struct client_command_context *cmd) { struct client *client = cmd->client; + struct mail_namespace *ns; struct mail_storage *storage; struct mailbox_list *list; struct mailbox *mailbox; @@ -21,9 +23,10 @@ return TRUE; } - storage = client_find_storage(cmd, &name); - if (storage == NULL) + ns = client_find_namespace(cmd, &name); + if (ns == NULL) return TRUE; + storage = ns->storage; mailbox = client->mailbox; if (mailbox != NULL && mailbox_get_storage(mailbox) == storage &&
--- a/src/imap/cmd-subscribe.c Mon Aug 03 12:54:21 2009 -0400 +++ b/src/imap/cmd-subscribe.c Tue Aug 04 14:27:29 2009 -0400 @@ -38,9 +38,10 @@ verify_name = mailbox; real_name = mailbox; - storage = client_find_storage(cmd, &real_name); - if (storage == NULL) + ns = client_find_namespace(cmd, &real_name); + if (ns == NULL) return TRUE; + storage = ns->storage; /* now find a namespace where the subscription can be added to */ ns = mail_namespace_find_subscribable(cmd->client->user->namespaces,