[svn-commits] mmichelson: branch 1.6.1 r139560 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Aug 22 15:03:55 2008
New Revision: 139560

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

........
r139558 | mmichelson | 2008-08-22 15:02:35 -0500 (Fri, 22 Aug 2008) | 9 lines

Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
manager events

(closes issue #13358)
Reported by: srt
Patches:
      13358_parking_events.diff uploaded by srt (license 378)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=139560&r1=139559&r2=139560
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Fri Aug 22 15:03:55 2008
@@ -2364,12 +2364,14 @@
 		"Channel: %s\r\n"
 		"Parkinglot: %s\r\n"
 		"CallerIDNum: %s\r\n"
-		"CallerIDName: %s\r\n\r\n",
+		"CallerIDName: %s\r\n",
+		"UniqueID: %s\r\n\r\n",
 		pu->parkingexten, 
 		pu->chan->name,
 		pu->parkinglot->name,
 		S_OR(pu->chan->cid.cid_num, "<unknown>"),
-		S_OR(pu->chan->cid.cid_name, "<unknown>")
+		S_OR(pu->chan->cid.cid_name, "<unknown>"),
+		pu->chan->uniqueid
 		);
 }