[svn-commits] schmidts: trunk r334744 - /trunk/main/features.c

[SVN commits to the Digium repositories]

Author: schmidts
Date: Wed Sep  7 09:47:03 2011
New Revision: 334744

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334744
Log:
clean up wrong merged stuff 


Modified:
    trunk/main/features.c

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=334744&r1=334743&r2=334744
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Sep  7 09:47:03 2011
@@ -7063,12 +7063,6 @@
 		ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n", chan_name);
 		goto pickup_failed;
 	}
-	
-	/* setting this flag to generate a reason header in the cancel message to the ringing channel */
-	ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE);
-
-	/* setting this flag to generate a reason header in the cancel message to the ringing channel */
-	ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE);
 
 	if (ast_channel_masquerade(target, chan)) {
 		ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan_name,