[asterisk-commits] mnicholson: trunk r158924 - in /trunk: UPGRADE.txt apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Nov 24 18:05:41 2008
New Revision: 158924

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158924
Log:
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

Modified:
    trunk/UPGRADE.txt
    trunk/apps/app_queue.c

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?view=diff&rev=158924&r1=158923&r2=158924
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Nov 24 18:05:41 2008
@@ -65,6 +65,9 @@
   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

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=158924&r1=158923&r2=158924
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Nov 24 18:05:41 2008
@@ -1920,7 +1920,7 @@
 		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"),