diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-04-03 19:59:55 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-04-03 19:59:55 +0000 |
| commit | a3c84f9575ac8c1b168bc4f02cf6e9ccd3b5d7f1 (patch) | |
| tree | 4aba03579cf7520a962c288e638c150142ab21d9 /apps | |
| parent | 06061491ba647e9d7c9f5cd6bbf0e8c54e15688c (diff) | |
Merged revisions 186445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines
Found a conflict in the last commit, due to multiple targets
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@186447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 070b78d02..45de59836 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1911,9 +1911,9 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i } imap_delete_old_greeting(fn, vms); } - - make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), fn, introfn, fmt, duration, 1, chan, NULL, 1, flag); - /* read mail file to memory */ + + make_email_file(p, myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, "INBOX", S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), fn, introfn, fmt, duration, 1, chan, NULL, 1, flag); + /* read mail file to memory */ len = ftell(p); rewind(p); if (!(buf = ast_malloc(len + 1))) { |