[asterisk-commits] rmudgett: trunk r290615 - in /trunk: ./ apps/app_dial.c

Wed Oct 6 13:56:12 CDT 2010

Author: rmudgett
Date: Wed Oct  6 13:56:11 2010
New Revision: 290615

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

................
  r290614 | rmudgett | 2010-10-06 13:50:37 -0500 (Wed, 06 Oct 2010) | 12 lines
  
  Merged revision 290613 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
  
  ..........
    r290613 | rmudgett | 2010-10-06 13:42:41 -0500 (Wed, 06 Oct 2010) | 5 lines
  
    Eliminate a redundant test for AST_CONTROL_REDIRECTING.
  
    Eliminate redundant test for AST_CONTROL_REDIRECTING that prevents running
    the redirecting interception macro if it is defined.
  ..........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

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

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=290615&r1=290614&r2=290615
==============================================================================

--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Oct  6 13:56:11 2010
@@ -1404,8 +1404,7 @@
 				if ((f->subclass.integer == AST_CONTROL_HOLD) ||
 				    (f->subclass.integer == AST_CONTROL_UNHOLD) ||
 				    (f->subclass.integer == AST_CONTROL_VIDUPDATE) ||
-				    (f->subclass.integer == AST_CONTROL_SRCUPDATE) ||
-				    (f->subclass.integer == AST_CONTROL_REDIRECTING)) {
+				    (f->subclass.integer == AST_CONTROL_SRCUPDATE)) {
 					ast_verb(3, "%s requested special control %d, passing it to %s\n", in->name, f->subclass.integer, outgoing->chan->name);
 					ast_indicate_data(outgoing->chan, f->subclass.integer, f->data.ptr, f->datalen);
 				} else if (f->subclass.integer == AST_CONTROL_CONNECTED_LINE) {


