From 17ed84ff0749450a9ed325a6a2a0e6069db04f9e Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Tue, 25 Nov 2008 00:05:41 +0000 Subject: [PATCH] Make the Join event from app_queue use CallerIDNum insead of CallerID for indicating the callerid number just like the rest of asterisk. (closes issue #13883) Reported by: davidw git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158924 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- UPGRADE.txt | 3 +++ apps/app_queue.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/UPGRADE.txt b/UPGRADE.txt index 8801608a21..199da5ed51 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -65,6 +65,9 @@ From 1.6.0.x to 1.6.1: to differentiate your variable from the append operator. This potential conflict is unlikely, but is documented here to be thorough. +* The "Join" event from app_queue now uses the CallerIDNum header instead of + the CallerID header to indicate the CallerID number. + From 1.6.1 to 1.6.2: * The default console now will use colors according to the default background diff --git a/apps/app_queue.c b/apps/app_queue.c index a94df3457e..3357dd8bdd 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1920,7 +1920,7 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result * q->count++; res = 0; manager_event(EVENT_FLAG_CALL, "Join", - "Channel: %s\r\nCallerID: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n", + "Channel: %s\r\nCallerIDNum: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n", qe->chan->name, S_OR(qe->chan->cid.cid_num, "unknown"), /* XXX somewhere else it is */ S_OR(qe->chan->cid.cid_name, "unknown"),