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

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

Author: pari
Date: Thu Mar 29 01:21:02 2007
New Revision: 539

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

........
r538 | pari | 2007-03-29 01:18:52 -0500 (Thu, 29 Mar 2007) | 1 line

fix for http://bugs.digium.com/view.php?id=9409
........

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 Thu Mar 29 01:21:02 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536
+/trunk:1-430,433-448,501,505,512,519,532,536,538

Modified: branches/aadk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/menus.html?view=diff&rev=539&r1=538&r2=539
==============================================================================
--- branches/aadk/config/menus.html (original)
+++ branches/aadk/config/menus.html Thu Mar 29 01:21:02 2007
@@ -57,8 +57,8 @@
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] +"' sec for KeyPress";
 	}
-	if( temp[2].match("ResponseTimeout") ){
-		temp[2] = temp[2].replace(/ResponseTimeout\(/, "");
+	if( temp[2].match("TIMEOUT") ){
+		temp[2] = temp[2].replace(/Set\(TIMEOUT\(response\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Response Timeout to '" + temp[2] + "' sec";
 	}
@@ -339,7 +339,7 @@
 		action_string = "s,"+ newpriority+ ",DigitTimeout(" + _nsv.value + ")";
 		break;
 	case 'ResponseTimeout':
-		action_string = "s,"+ newpriority+ ",ResponseTimeout(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(response)=" + _nsv.value + ")";
 		break;
 	case 'Playback':
 		action_string = "s,"+ newpriority+ ",Playback(" + _nsv.value + ")";

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 29 01:21:02 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536
+/trunk:1-448,501-505,507,511-512,519,532,536,538

Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=539&r1=538&r2=539
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Thu Mar 29 01:21:02 2007
@@ -57,8 +57,8 @@
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] +"' sec for KeyPress";
 	}
-	if( temp[2].match("ResponseTimeout") ){
-		temp[2] = temp[2].replace(/ResponseTimeout\(/, "");
+	if( temp[2].match("TIMEOUT") ){
+		temp[2] = temp[2].replace(/Set\(TIMEOUT\(response\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Response Timeout to '" + temp[2] + "' sec";
 	}
@@ -339,7 +339,7 @@
 		action_string = "s,"+ newpriority+ ",DigitTimeout(" + _nsv.value + ")";
 		break;
 	case 'ResponseTimeout':
-		action_string = "s,"+ newpriority+ ",ResponseTimeout(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(response)=" + _nsv.value + ")";
 		break;
 	case 'Playback':
 		action_string = "s,"+ newpriority+ ",Playback(" + _nsv.value + ")";