aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-07 20:29:04 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-07 20:29:04 +0000
commited43cd87cc497008296e8579861feb3384ecb431 (patch)
treeb6fff7baa53ddf7b0fcd3db38e5bfcbff3ed244c /apps
parenteb6927ff3c1b80bd7e684975160c7cac82b44703 (diff)
Merged revisions 128731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r128731 | mmichelson | 2008-07-07 15:28:33 -0500 (Mon, 07 Jul 2008) | 7 lines If imapfolder=foo were set in voicemail.conf, then when calling VoiceMailMain, app_voicemail would attempt to play a file called vm-foo instead of playing vm-INBOX to play the "new" sound file. This commit fixes that issue. This may fix one of the problems reported in issue #12987 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128732 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3ac097769..37f402696 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5023,10 +5023,14 @@ static void imap_mailbox_name(char *spec, size_t len, struct vm_state *vms, int
if (box == OLD_FOLDER) {
ast_copy_string(vms->curbox, mbox(NEW_FOLDER), sizeof(vms->curbox));
- snprintf(vms->vmbox, sizeof(vms->vmbox), "vm-%s", mbox(1));
} else {
ast_copy_string(vms->curbox, mbox(box), sizeof(vms->curbox));
- snprintf(vms->vmbox, sizeof(vms->vmbox), "vm-%s", vms->curbox);
+ }
+
+ if (box == NEW_FOLDER) {
+ ast_copy_string(vms->vmbox, "vm-INBOX", sizeof(vm->vmbox));
+ } else {
+ snprintf(vms->vmbox, sizeof(vm->vmbox), "vm-%s", mbox(box));
}
/* Build up server information */