[asterisk-commits] rmudgett: branch 1.6.2 r293340 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Oct 29 19:40:10 2010
New Revision: 293340

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

........
  r293339 | rmudgett | 2010-10-29 19:34:12 -0500 (Fri, 29 Oct 2010) | 1 line
  
  Remove some code that serves no purpose.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

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

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=293340&r1=293339&r2=293340
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Fri Oct 29 19:40:10 2010
@@ -6590,17 +6590,6 @@
 						/* Lets see what we're up to */
 						if (((ast->pbx) || (ast->_state == AST_STATE_UP)) &&
 							(p->transfertobusy || (ast->_state != AST_STATE_BUSY))) {
-							struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner);
-							int way3bridge = 0, cdr3way = 0;
-
-							if (!other) {
-								other = ast_bridged_channel(p->subs[SUB_REAL].owner);
-							} else
-								way3bridge = 1;
-
-							if (p->subs[SUB_THREEWAY].owner->cdr)
-								cdr3way = 1;
-
 							ast_verb(3, "Building conference on call on %s and %s\n", p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name);
 							/* Put them in the threeway, and flip */
 							p->subs[SUB_THREEWAY].inthreeway = 1;