pari: branch asterisknow r678 - in /branches: aadk/ aadk/config/ asterisknow/...

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Mon Apr 16 16:18:49 2007
New Revision: 678

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=678
Log:
Merged revisions 677 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r677 | pari | 2007-04-16 16:01:06 -0500 (Mon, 16 Apr 2007) | 1 line

as pointed by Alvaro Oliver
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/menus.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/menus.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 16 16:18:49 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-661
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-677

Modified: branches/aadk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/menus.html?view=diff&rev=678&r1=677&r2=678
==============================================================================
--- branches/aadk/config/menus.html (original)
+++ branches/aadk/config/menus.html Mon Apr 16 16:18:49 2007
@@ -59,7 +59,7 @@
 		return "Play '" + temp[2] + "' & Listen for KeyPress";
 	}
 	if( temp[2].match("DigitTimeout") ){
-		temp[2] = temp[2].replace(/DigitTimeout\(/, "");
+		temp[2] = temp[2].replace(/Set\(TIMEOUT\(digit\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] +"' sec for KeyPress";
 	}
@@ -345,7 +345,7 @@
 		action_string = "s,"+ newpriority+ ",Background(" + _nsv.value + ")";
 		break;
 	case 'DigitTimeout':
-		action_string = "s,"+ newpriority+ ",DigitTimeout(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(digit)=" + _nsv.value + ")";
 		break;
 	case 'ResponseTimeout':
 		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(response)=" + _nsv.value + ")";

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 16 16:18:49 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-660
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-677

Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=678&r1=677&r2=678
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Mon Apr 16 16:18:49 2007
@@ -59,7 +59,7 @@
 		return "Play '" + temp[2] + "' & Listen for KeyPress";
 	}
 	if( temp[2].match("DigitTimeout") ){
-		temp[2] = temp[2].replace(/DigitTimeout\(/, "");
+		temp[2] = temp[2].replace(/Set\(TIMEOUT\(digit\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] +"' sec for KeyPress";
 	}
@@ -345,7 +345,7 @@
 		action_string = "s,"+ newpriority+ ",Background(" + _nsv.value + ")";
 		break;
 	case 'DigitTimeout':
-		action_string = "s,"+ newpriority+ ",DigitTimeout(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(digit)=" + _nsv.value + ")";
 		break;
 	case 'ResponseTimeout':
 		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(response)=" + _nsv.value + ")";