[svn-commits] tilghman: branch 1.6.0 r106662 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Mar  7 10:27:22 2008
New Revision: 106662

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106662
Log:
Merged revisions 106654 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106654 | tilghman | 2008-03-07 10:26:07 -0600 (Fri, 07 Mar 2008) | 11 lines

Merged revisions 106635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106635 | tilghman | 2008-03-07 10:22:11 -0600 (Fri, 07 Mar 2008) | 3 lines

Warn the user when a temporary greeting exists
(Closes issue #11409)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Mar  7 10:27:22 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=106662&r1=106661&r2=106662
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Fri Mar  7 10:27:22 2008
@@ -6607,13 +6607,22 @@
 			cmd = 't';
 			break;
 		default: 
-			cmd = ast_play_and_wait(chan, "vm-options");
-			if (!cmd)
+			snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username);
+			if (ast_fileexists(prefile, NULL, NULL)) {
+				cmd = ast_play_and_wait(chan, "vm-tmpexists");
+			}
+			if (!cmd) {
+				cmd = ast_play_and_wait(chan, "vm-options");
+			}
+			if (!cmd) {
 				cmd = ast_waitfordigit(chan, 6000);
-			if (!cmd)
+			}
+			if (!cmd) {
 				retries++;
-			if (retries > 3)
+			}
+			if (retries > 3) {
 				cmd = 't';
+			}
 		}
 	}
 	if (cmd == 't')