[svn-commits] russell: trunk r38994 - in /trunk: ./ channel.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sat Aug  5 04:03:27 2006
New Revision: 38994

URL: http://svn.digium.com/view/asterisk?rev=38994&view=rev
Log:
Merged revisions 38982 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38982 | russell | 2006-08-05 05:01:37 -0400 (Sat, 05 Aug 2006) | 6 lines

Always generate a Newstate event in ast_setstate() instead of making it a
Newchannel event if the state was AST_STATE_DOWN.  The Newchannel event will
always be generated in ast_request(), so this just causes a duplicated
Newchannel event in some cases.  
(issue #7506, repoted by capouch, fixed by me)

........

Modified:
    trunk/   (props changed)
    trunk/channel.c

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

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=38994&r1=38993&r2=38994&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Sat Aug  5 04:03:27 2006
@@ -3357,8 +3357,7 @@
 
 	chan->_state = state;
 	ast_device_state_changed_literal(chan->name);
-	manager_event(EVENT_FLAG_CALL,
-		      (oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
+	manager_event(EVENT_FLAG_CALL, "Newstate",
 		      "Channel: %s\r\n"
 		      "State: %s\r\n"
 		      "CallerID: %s\r\n"