From: Automerge Script <automerge@asterisk.org>
Date: Wed, 27 Jun 2007 19:25:45 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.20-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd917ea9f4e823f12820372d47809a0501bb8033;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 98128957a5..070ebcd5e5 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6758,7 +6758,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
 				/* User has hung up, no options to give */
 				if (!outsidecaller) {
 					/* user was recording a greeting and they hung up, so let's delete the recording. */
-					vm_delete(tempfile);
+					ast_filedelete(tempfile, NULL);
 				}
  				return cmd;
 			}
@@ -6773,14 +6773,14 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
  				if (option_verbose > 2)
 					ast_verbose(VERBOSE_PREFIX_3 "Message too short\n");
 				cmd = ast_play_and_wait(chan, "vm-tooshort");
- 				cmd = vm_delete(tempfile);
+ 				cmd = ast_filedelete(tempfile, NULL);
  				break;
  			}
  			else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
  				/* Message is all silence */
  				if (option_verbose > 2)
 					ast_verbose(VERBOSE_PREFIX_3 "Nothing recorded\n");
- 				cmd = vm_delete(tempfile);
+ 				cmd = ast_filedelete(tempfile, NULL);
 				cmd = ast_play_and_wait(chan, "vm-nothingrecorded");
 				if (!cmd)
  					cmd = ast_play_and_wait(chan, "vm-speakup");
@@ -6809,7 +6809,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
  		case '*':
  			/* Cancel recording, delete message, offer to take another message*/
  			cmd = ast_play_and_wait(chan, "vm-deleted");
- 			cmd = vm_delete(tempfile);
+ 			cmd = ast_filedelete(tempfile, NULL);
  			if (outsidecaller) {
  				res = vm_exec(chan, NULL);
  				return res;