diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-05 09:03:31 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-05 09:03:31 +0000 |
| commit | c1c7c4568b629a6772e806f77a46df3c1d84657b (patch) | |
| tree | 45fa94a947cc26aaf9380a7e5ad354927342beab | |
| parent | 07414d95a2491a0f1b37757a0241725acb0968eb (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38995 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_queue.c | 1 | ||||
| -rw-r--r-- | channel.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index e336fa231..84fb751b1 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; } @@ -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" |