[asterisk-commits] rmudgett: branch 1.6.1 r154269 - in /branches/1.6.1: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Nov  4 13:09:15 2008
New Revision: 154269

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154269
Log:
Merged revisions 154268 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r154268 | rmudgett | 2008-11-04 13:07:26 -0600 (Tue, 04 Nov 2008) | 11 lines
  
  Merged revisions 154266 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154266 | rmudgett | 2008-11-04 13:01:08 -0600 (Tue, 04 Nov 2008) | 4 lines
    
    JIRA ABE-1703
    mISDN sets the channel to the wrong state when it receives
    the indication AST_CONTROL_RINGING.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_misdn.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_misdn.c?view=diff&rev=154269&r1=154268&r2=154269
==============================================================================
--- branches/1.6.1/channels/chan_misdn.c (original)
+++ branches/1.6.1/channels/chan_misdn.c Tue Nov  4 13:09:15 2008
@@ -2479,7 +2479,7 @@
 			}
 
 			chan_misdn_log(3, p->bc->port, " --> * SEND: State Ring pid:%d\n", p->bc ? p->bc->pid : -1);
-			ast_setstate(ast, AST_STATE_RINGING);
+			ast_setstate(ast, AST_STATE_RING);
 			
 			if ( !p->bc->nt && (p->originator == ORG_MISDN) && !p->incoming_early_audio ) 
 				chan_misdn_log(2, p->bc->port, " --> incoming_early_audio off\n");