[svn-commits] russell: trunk r63609 - in /trunk: ./ main/channel.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed May  9 11:44:33 2007
New Revision: 63609

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63609
Log:
Merged revisions 63608 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63608 | russell | 2007-05-09 11:43:50 -0500 (Wed, 09 May 2007) | 5 lines

Only call ast_senddigit_begin() in ast_senddigit() if the channel has a 
send_digit_begin() callback.  Checking the END_DTMF_ONLY flag was the
wrong thing to do, because that flag indicates that a *bridged* channel
only wants DTMF END events coming from this channel.

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=63609&r1=63608&r2=63609
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed May  9 11:44:33 2007
@@ -2614,7 +2614,7 @@
 
 int ast_senddigit(struct ast_channel *chan, char digit)
 {
-	if (!ast_test_flag(chan, AST_FLAG_END_DTMF_ONLY)) {
+	if (chan->tech->send_digit_begin) {
 		ast_senddigit_begin(chan, digit);
 		ast_safe_sleep(chan, 100); /* XXX 100ms ... probably should be configurable */
 	}