[asterisk-commits] mmichelson: branch mmichelson/more_transfer r387777 - /team/mmichelson/more_t...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon May  6 14:25:11 2013
New Revision: 387777

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387777
Log:
Make call pickup use ast_channel_move()


Modified:
    team/mmichelson/more_transfer/main/features.c

Modified: team/mmichelson/more_transfer/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/more_transfer/main/features.c?view=diff&rev=387777&r1=387776&r2=387777
==============================================================================
--- team/mmichelson/more_transfer/main/features.c (original)
+++ team/mmichelson/more_transfer/main/features.c Mon May  6 14:25:11 2013
@@ -7795,7 +7795,7 @@
 	/* setting the HANGUPCAUSE so the ringing channel knows this call was not a missed call */
 	ast_channel_hangupcause_set(chan, AST_CAUSE_ANSWERED_ELSEWHERE);
 
-	if (ast_channel_masquerade(target, chan)) {
+	if (ast_channel_move(target, chan)) {
 		ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan_name,
 			target_name);
 		goto pickup_failed;
@@ -7816,8 +7816,6 @@
 		"TargetChannel: %s\r\n",
 		chan_name, target_name);
 
-	/* Do the masquerade manually to make sure that it is completed. */
-	ast_do_masquerade(target);
 	res = 0;
 
 pickup_failed: