[asterisk-commits] qwell: trunk r72183 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Jun 27 13:37:44 2007
New Revision: 72183

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72183
Log:
Merged revisions 72182 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72182 | qwell | 2007-06-27 13:36:56 -0500 (Wed, 27 Jun 2007) | 4 lines

Fix another problem in voicemail with missing symbols.

Issue 10074, patch by kryptolus, extended to include #if 0'd blocks (just in case)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=72183&r1=72182&r2=72183
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Jun 27 13:37:44 2007
@@ -8658,7 +8658,7 @@
 				/* 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;
 			}
@@ -8673,14 +8673,14 @@
 				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");
@@ -8709,7 +8709,7 @@
 		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;