[asterisk-commits] mnicholson: branch 1.6.1 r158927 - in /branches/1.6.1: ./ apps/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Mon Nov 24 18:41:07 2008
New Revision: 158927

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158927
Log:
Merged revisions 158924 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158924 | mnicholson | 2008-11-24 18:05:41 -0600 (Mon, 24 Nov 2008) | 6 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/UPGRADE.txt
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/UPGRADE.txt?view=diff&rev=158927&r1=158926&r2=158927
==============================================================================
--- branches/1.6.1/UPGRADE.txt (original)
+++ branches/1.6.1/UPGRADE.txt Mon Nov 24 18:41:07 2008
@@ -64,3 +64,6 @@
   workaround is to ensure that a space occurs between the '+' and the '=',
   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.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=158927&r1=158926&r2=158927
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Mon Nov 24 18:41:07 2008
@@ -1738,7 +1738,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"),