From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 3 Apr 2009 19:56:48 +0000 (+0000)
Subject: Found a conflict in the last commit, due to multiple targets
X-Git-Tag: 1.4.25-rc1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9585f4ba62d636eaac00b59c78c34adbc5e5bd;p=thirdparty%2Fasterisk.git

Found a conflict in the last commit, due to multiple targets


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@186445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 07cfb72a3a..42c3637fdc 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1307,7 +1307,7 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
 			*(vmu->email) = '\0';
 		return -1;
 	} else {
-		make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, vms->curbox, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), fn, fmt, duration, 1, chan, NULL, 1);
+		make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, vms->curbox, "INBOX", S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), fn, fmt, duration, 1, chan, NULL, 1);
 		/* read mail file to memory */
 		len = ftell(p);
 		rewind(p);