diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 19:56:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-03 19:56:48 +0000 |
| commit | 0d551f8addaefb05c2d6ee7b8301dbb9586c9687 (patch) | |
| tree | c9440f88dfc6eb0cbc4aaa88fefef883ce205d46 /apps/app_voicemail.c | |
| parent | 75d063e66200d435c39f848a25fc36435ddd57b3 (diff) | |
Found a conflict in the last commit, due to multiple targets
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@186445 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 07cfb72a3..42c3637fd 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); |