dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 180464 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r180464 | mmichelson | 2009-03-05 17:26:11 -0600 (Thu, 05 Mar 2009) | 16 lines
  
  [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: http://svn.digium.com/svn/asterisk/trunk@180465 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mmichelson 2009-03-05 23:26:58 +00:00
parent 03d8382060
commit c4c3486164
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_voicemail.c
View File

@ -1804,6 +1804,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;
@ -2251,6 +2252,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;