[svn-commits] jpeeler: branch jpeeler/asterisk-sigwork-trunk r203303 - in /team/jpeeler/ast...

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Jun 25 14:37:35 2009
New Revision: 203303

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203303
Log:
sync with trunk again

Modified:
    team/jpeeler/asterisk-sigwork-trunk/   (props changed)
    team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c

Propchange: team/jpeeler/asterisk-sigwork-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 25 14:37:35 2009
@@ -1,1 +1,1 @@
-/trunk:1-203241
+/trunk:1-203302

Modified: team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c?view=diff&rev=203303&r1=203302&r2=203303
==============================================================================
--- team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c (original)
+++ team/jpeeler/asterisk-sigwork-trunk/channels/chan_dahdi.c Thu Jun 25 14:37:35 2009
@@ -6194,6 +6194,7 @@
 			/* absorb event */
 		} else {
 #endif
+			dahdi_confmute(p, 0);
 			p->subs[idx].f.frametype = AST_FRAME_DTMF_END;
 			p->subs[idx].f.subclass = res & 0xff;
 #ifdef HAVE_PRI