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.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@293418 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d09424eaa03766925943d04a09904ab9522f627d..9952982408f9e9a1d48390c187fd429060ba1840 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8168,17 +8168,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                                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 */

diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index d63f5aa84118b1087096e699fcf4a007dbab40f4..1d68889be03d8a6c4fe35a43d5003ebe07a6ae52 100644 (file)
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -3113,20 +3113,8 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
                                                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,