[asterisk-dev] [asterisk-commits] seanbright: branch 1.6.0 r138483 - in /branches/1.6.0: ./ main/features.c

[Sean Bright]

I considered this trivial and non-invasive enough to merge to the 1.6.0
and 1.6.1 branches.  If I should revert, please let me know.

SVN commits to the Asterisk project wrote:
> Author: seanbright
> Date: Sun Aug 17 09:14:46 2008
> New Revision: 138483
> 
> URL: http://svn.digium.com/view/asterisk?view=rev&rev=138483
> Log:
> Merged revisions 138482 via svnmerge from 
> https://origsvn.digium.com/svn/asterisk/trunk
> 
> ........
> r138482 | seanbright | 2008-08-17 10:12:11 -0400 (Sun, 17 Aug 2008) | 6 lines
> 
> Move Uniqueid to the end of the event for those that rely on the position
> of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.
> 
> For those of you who rely on the position of name/value pairs in manager
> events... stop... that is why associative arrays were invented.
> 
> ........
> 
> Modified:
>     branches/1.6.0/   (props changed)
>     branches/1.6.0/main/features.c
> 
> Propchange: branches/1.6.0/
> ------------------------------------------------------------------------------
> Binary property 'trunk-merged' - no diff available.
> 
> Modified: branches/1.6.0/main/features.c
> URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=138483&r1=138482&r2=138483
> ==============================================================================
> --- branches/1.6.0/main/features.c (original)
> +++ branches/1.6.0/main/features.c Sun Aug 17 09:14:46 2008
> @@ -475,15 +475,16 @@
>  	manager_event(EVENT_FLAG_CALL, "ParkedCall",
>  		"Exten: %s\r\n"
>  		"Channel: %s\r\n"
> -		"Uniqueid: %s\r\n"
>  		"From: %s\r\n"
>  		"Timeout: %ld\r\n"
>  		"CallerIDNum: %s\r\n"
> -		"CallerIDName: %s\r\n",
> -		pu->parkingexten, pu->chan->name, pu->chan->uniqueid, peer ? peer->name : "",
> +		"CallerIDName: %s\r\n"
> +		"Uniqueid: %s\r\n",
> +		pu->parkingexten, pu->chan->name, peer ? peer->name : "",
>  		(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
>  		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
>  		);
>  
>  	if (peer && adsipark && ast_adsi_available(peer)) {
> 
> 
> _______________________________________________
> --Bandwidth and Colocation Provided by http://www.api-digital.com--
> 
> asterisk-commits mailing list
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-commits


-- 
Sean Bright
sean.bright at gmail.com