From 76f53007930745ce4b129d1320c5ec8cbfe996c7 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Sat, 5 Aug 2006 09:03:31 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38995 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 1 - channel.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index e336fa2313..84fb751b1c 100644 --- 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 830def7960..738c6581b8 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" -- 2.47.2