[asterisk-commits] tilghman: branch 1.4 r186445 - /branches/1.4/apps/app_voicemail.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Apr 3 14:56:51 CDT 2009
Author: tilghman
Date: Fri Apr 3 14:56:48 2009
New Revision: 186445
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186445
Log:
Found a conflict in the last commit, due to multiple targets
Modified:
branches/1.4/apps/app_voicemail.c
Modified: branches/1.4/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=186445&r1=186444&r2=186445
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Fri Apr 3 14:56:48 2009
@@ -1307,7 +1307,7 @@
*(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);
More information about the asterisk-commits
mailing list