[Freeswitch-trunk] [commit] r6812 - in freeswitch/trunk: conf/lang/en/vm src

[Freeswitch SVN]

Author: brian
Date: Sat Dec 15 13:48:06 2007
New Revision: 6812

Modified:
   freeswitch/trunk/conf/lang/en/vm/sounds.xml
   freeswitch/trunk/src/switch_channel.c

Log:
commit a missing file from tonys commit and my update to sounds.xml

Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml
==============================================================================
--- freeswitch/trunk/conf/lang/en/vm/sounds.xml	(original)
+++ freeswitch/trunk/conf/lang/en/vm/sounds.xml	Sat Dec 15 13:48:06 2007
@@ -201,7 +201,7 @@
   </macro>
 
   <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
 	<action function="play-file" data="voicemail/vm-greeting.wav"/>
 	<action function="say" data="$1" method="pronounced" type="items"/>
@@ -220,7 +220,7 @@
   </macro>
 
   <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
 	<action function="say" data="$1" method="pronounced" type="items"/>
       </match>
@@ -228,7 +228,7 @@
   </macro>
 
   <macro name="voicemail_say_message_number">
-    <input pattern="^([a-z]+):(.*)$">
+    <input pattern="^([a-z]+):(\d+)$">
       <match>
 	<action function="play-file" data="voicemail/vm-$1.wav"/> 
 	<action function="play-file" data="voicemail/vm-message_number.wav"/>

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Sat Dec 15 13:48:06 2007
@@ -610,7 +610,7 @@
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session));
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Call-Direction", "%s", switch_channel_test_flag(channel, CF_OUTBOUND) ? "outbound" : "inbound");
 				if (switch_channel_test_flag(channel, CF_ANSWERED)) {
-					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "confirmed");
+					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "answered");
 				} else if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
 					switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "early");
 				} else {