automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38995 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 2 deletions

diff --git a/channel.c b/channel.c
index 830def796..738c6581b 100644
--- a/channel.c
+++ b/channel.c
@@ -3190,8 +3190,7 @@ int ast_setstate(struct ast_channel *chan, int state)
 
 	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"