[svn-commits] eliel: branch 1.6.2 r195164 - in /branches/1.6.2: ./ apps/ main/

[SVN commits to the Digium repositories]

Author: eliel
Date: Mon May 18 09:54:38 2009
New Revision: 195164

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

........
  r195162 | eliel | 2009-05-18 10:45:23 -0400 (Mon, 18 May 2009) | 9 lines
  
  Warn about the use of the application WaitExten() within a Macro().
  
  Update applications documentation to warn the user about the use of the
  WaitExten() application within a Macro(). Recommend the use of Read()
  instead.
  
  (closes issue #14444)
  Reported by: ewieling
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_dial.c
    branches/1.6.2/apps/app_macro.c
    branches/1.6.2/main/pbx.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/apps/app_dial.c?view=diff&rev=195164&r1=195163&r2=195164
==============================================================================
--- branches/1.6.2/apps/app_dial.c (original)
+++ branches/1.6.2/apps/app_dial.c Mon May 18 09:54:38 2009
@@ -248,6 +248,9 @@
 						with this option. Also, pbx services are not run on the peer (called) channel,
 						so you will not be able to set timeouts via the TIMEOUT() function in this macro.</para>
 					</note>
+					<warning><para>Be aware of the limitations that macros have, specifically with regards to use of
+					the <literal>WaitExten</literal> application. For more information, see the documentation for
+					Macro()</para></warning>
 				</option>
 				<option name="n">
 					<para>This option is a modifier for the call screening/privacy mode. (See the 

Modified: branches/1.6.2/apps/app_macro.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/apps/app_macro.c?view=diff&rev=195164&r1=195163&r2=195164
==============================================================================
--- branches/1.6.2/apps/app_macro.c (original)
+++ branches/1.6.2/apps/app_macro.c Mon May 18 09:54:38 2009
@@ -68,6 +68,9 @@
 			applications in deeply nested macros could cause asterisk to crash earlier than this limit.
 			It is advised that if you need to deeply nest macro calls, that you use the Gosub application
 			(now allows arguments like a Macro) with explict Return() calls instead.</para></warning>
+			<warning><para>Use of the application <literal>WaitExten</literal> within a macro will not function
+			as expected. Please use the <literal>Read</literal> application in order to read DTMF from a channel
+			currently executing a macro.</para></warning>
 		</description>
 		<see-also>
 			<ref type="application">MacroExit</ref>
@@ -97,6 +100,7 @@
 			<replaceable>expr</replaceable> is true (otherwise <replaceable>macroiffalse</replaceable>
 			if provided)</para>
 			<para>Arguments and return values as in application Macro()</para>
+			<xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
 		</description>
 		<see-also>
 			<ref type="application">GotoIf</ref>
@@ -120,6 +124,7 @@
 			Only one call at a time may run the macro. (we'll wait if another call is busy
 			executing in the Macro)</para>
 			<para>Arguments and return values as in application Macro()</para>
+			<xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
 		</description>
 		<see-also>
 			<ref type="application">Macro</ref>

Modified: branches/1.6.2/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=195164&r1=195163&r2=195164
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Mon May 18 09:54:38 2009
@@ -679,6 +679,7 @@
 		<description>
 			<para>This application waits for the user to enter a new extension for a specified number
 			of <replaceable>seconds</replaceable>.</para>
+			<xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
 		</description>
 		<see-also>
 			<ref type="application">Background</ref>