aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-25 00:05:41 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-25 00:05:41 +0000
commit2ca1ca67860ad335abeafecd61432b81062f749f (patch)
tree737d18be5600de14aeb0db641c7d235acdcfe691
parent56aff74a07df2336737f0664f13bc9679cc70571 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@158924 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--UPGRADE.txt3
-rw-r--r--apps/app_queue.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 8801608a2..199da5ed5 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 a94df3457..3357dd8bd 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 <unknown> */
S_OR(qe->chan->cid.cid_name, "unknown"),