[svn-commits] seanbright: branch 1.6.1 r212583 - in /branches/1.6.1: ./ channels/chan_agent.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Aug 17 13:55:32 2009
New Revision: 212583

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

........
  r212581 | seanbright | 2009-08-17 14:50:24 -0400 (Mon, 17 Aug 2009) | 5 lines
  
  Correct spelling of AGENTACCEPTDTMF in chan_agent.
  
  (closes issue #15668)
  Reported by: davidw
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_agent.c

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

Modified: branches/1.6.1/channels/chan_agent.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_agent.c?view=diff&rev=212583&r1=212582&r2=212583
==============================================================================
--- branches/1.6.1/channels/chan_agent.c (original)
+++ branches/1.6.1/channels/chan_agent.c Mon Aug 17 13:55:32 2009
@@ -2012,7 +2012,10 @@
 				} else {
 					p->wrapuptime = wrapuptime;
 				}
-				tmpoptions = pbx_builtin_getvar_helper(chan, "AGENTACCEPTDMTF");
+				tmpoptions = pbx_builtin_getvar_helper(chan, "AGENTACCEPTDTMF");
+				if (ast_strlen_zero(tmpoptions)) {
+					tmpoptions = pbx_builtin_getvar_helper(chan, "AGENTACCEPTDMTF");
+				}
 				if (!ast_strlen_zero(tmpoptions)) {
 					p->acceptdtmf = *tmpoptions;
 					ast_verb(3, "Saw variable AGENTACCEPTDTMF=%s, setting acceptdtmf to: %c for Agent '%s'.\n", tmpoptions, p->acceptdtmf, p->agent);