From a3c84f9575ac8c1b168bc4f02cf6e9ccd3b5d7f1 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 3 Apr 2009 19:59:55 +0000
Subject: [PATCH] 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
---
apps/app_voicemail.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 070b78d02a..45de598360 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))) {
--
GitLab