[asterisk-commits] rmudgett: trunk r293419 - in /trunk: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Oct 29 20:55:15 2010
New Revision: 293419

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

................
  r293418 | rmudgett | 2010-10-29 20:53:29 -0500 (Fri, 29 Oct 2010) | 16 lines
  
  Merged revisions 293417 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r293417 | rmudgett | 2010-10-29 20:49:15 -0500 (Fri, 29 Oct 2010) | 9 lines
    
    Merged revisions 293416 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r293416 | rmudgett | 2010-10-29 20:45:49 -0500 (Fri, 29 Oct 2010) | 1 line
      
      Remove some more code that serves no purpose.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_analog.c

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=293419&r1=293418&r2=293419
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Oct 29 20:55:15 2010
@@ -8193,17 +8193,6 @@
 						dahdi_enable_ec(p);
 						ast_hangup(chan);
 					} else {
- 						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, "Started three way call on channel %d\n", p->channel);
 
 						/* Start music on hold if appropriate */

Modified: trunk/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=293419&r1=293418&r2=293419
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Fri Oct 29 20:55:15 2010
@@ -3113,20 +3113,8 @@
 						analog_set_echocanceller(p, 1);
 						ast_hangup(chan);
 					} else {
- 						struct ast_channel *other = ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner);
- 						int way3bridge = 0, cdr3way = 0;
-
-						if (!other) {
-							other = ast_bridged_channel(p->subs[ANALOG_SUB_REAL].owner);
-						} else {
-							way3bridge = 1;
-						}
-
-						if (p->subs[ANALOG_SUB_THREEWAY].owner->cdr) {
-							cdr3way = 1;
-						}
-
 						ast_verb(3, "Started three way call on channel %d\n", p->channel);
+
 						/* Start music on hold if appropriate */
 						if (ast_bridged_channel(p->subs[ANALOG_SUB_THREEWAY].owner)) {
 							ast_queue_control_data(p->subs[ANALOG_SUB_THREEWAY].owner, AST_CONTROL_HOLD,