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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@128732 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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 */