From: Mark Michelson Date: Thu, 5 Mar 2009 23:26:11 +0000 (+0000) Subject: [IMAP] Fix message retrieval issues when identical mailbox names were defined in... X-Git-Tag: 1.4.24-rc1~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aef6c114f18e747f66f4b4ea3a3f828cfe9b73c1;p=thirdparty%2Fasterisk.git [IMAP] Fix message retrieval issues when identical mailbox names were defined in separate contexts. There was a fix put in a while back so that an X-Asterisk-VM-Context message header was added to stored IMAP voicemails. This would allow for us to differentiate if the same mailbox name was used in multiple contexts. The problem still left was that not all places where messages were retrieved actually attempted to use this header for information when retrieving messages. This commit fixes that so that MWI and message retrieval from VoiceMailMain work as expected. (closes issue #13853) Reported by: vicks1 Patches: 13853_v2.patch uploaded by mmichelson (license 60) Tested by: lmadsen git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@180464 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 1a4b4b0558..992de3b5b7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1229,6 +1229,7 @@ static int messagecount(const char *context, const char *mailbox, const char *fo ast_mutex_lock(&vms_p->lock); pgm = mail_newsearchpgm (); hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)(!ast_strlen_zero(vmu->imapvmshareid) ? vmu->imapvmshareid : mailbox)); + hdr->next = mail_newsearchheader("X-Asterisk-VM-Context", S_OR(context, "default")); pgm->header = hdr; if (fold != 1) { pgm->unseen = 1; @@ -1573,6 +1574,7 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) /* Check IMAP folder for Asterisk messages only... */ hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (!ast_strlen_zero(vmu->imapvmshareid) ? vmu->imapvmshareid : vmu->mailbox)); + hdr->next = mail_newsearchheader("X-Asterisk-VM-Context", vmu->context); pgm->header = hdr; pgm->deleted = 0; pgm->undeleted = 1;