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

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jan 16 11:42:47 2007
New Revision: 51149

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

................
r51148 | file | 2007-01-16 12:39:50 -0500 (Tue, 16 Jan 2007) | 10 lines

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

........
r51145 | file | 2007-01-16 12:36:50 -0500 (Tue, 16 Jan 2007) | 2 lines

Return previous behavior. ParkedCalls will be able to do DTMF based transfers again. trunk however will get an option to allow this to be set on/off. (issue #8804 reported by nortex)

........

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

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=51149&r1=51148&r2=51149
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Jan 16 11:42:47 2007
@@ -1828,6 +1828,8 @@
 			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);
 		res = ast_bridge_call(chan, peer, &config);
 
 		/* Simulate the PBX hanging up */