kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-05 09:03:31 +00:00
parent d5061be770
commit 76f5300793
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_queue.c
View File

@@ -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 we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) { if (qe->expire && (time(NULL) > qe->expire)) {
*reason = QUEUE_TIMEOUT; *reason = QUEUE_TIMEOUT;
ast_queue_log(qe->parent->name, qe->chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe->pos);
break; break;
} }

3
channel.c
View File

@@ -3190,8 +3190,7 @@ int ast_setstate(struct ast_channel *chan, int state)
chan->_state = state; chan->_state = state;
ast_device_state_changed_literal(chan->name); ast_device_state_changed_literal(chan->name);
manager_event(EVENT_FLAG_CALL, manager_event(EVENT_FLAG_CALL, "Newstate",
(oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
"Channel: %s\r\n" "Channel: %s\r\n"
"State: %s\r\n" "State: %s\r\n"
"CallerID: %s\r\n" "CallerID: %s\r\n"