automerge commit

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index e336fa23131d1740695dfcf295d1463e7a7092e4..84fb751b1c04f97acdffa9330d86416dbf471c85 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2018,7 +2018,6 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
                /* If we have timed out, break out */
                if (qe->expire && (time(NULL) > qe->expire)) {
                        *reason = QUEUE_TIMEOUT;
-                       ast_queue_log(qe->parent->name, qe->chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe->pos);
                        break;
                }
 

diff --git a/channel.c b/channel.c
index 830def79600e8f49296828cfd518487fe4aa0c01..738c6581b86ddb23cef52bdc6c45b80b0bd49f4a 100644 (file)
--- 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"