[asterisk-commits] file: trunk r48156 - in /trunk: ./ res/res_features.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Nov 30 13:06:22 2006
New Revision: 48156

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

................
r48155 | file | 2006-11-30 14:05:14 -0500 (Thu, 30 Nov 2006) | 10 lines

Merged revisions 48154 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48154 | file | 2006-11-30 14:04:11 -0500 (Thu, 30 Nov 2006) | 2 lines

Do not listen for DTMF on the bridge that comes into existence when ParkedCall is executed. This means native bridging can now occur for this. (issue #8406 reported by kebl0155)

........

................

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=48156&r1=48155&r2=48156
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Thu Nov 30 13:06:22 2006
@@ -1828,12 +1828,6 @@
 			ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
 
 		memset(&config, 0, sizeof(struct ast_bridge_config));
-		ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
-		ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
-		config.timelimit = 0;
-		config.play_warning = 0;
-		config.warning_freq = 0;
-		config.warning_sound=NULL;
 		res = ast_bridge_call(chan, peer, &config);
 
 		/* Simulate the PBX hanging up */