[svn-commits] mmichelson: branch mmichelson/acl-v6 r276533 - in /team/mmichelson/acl-v6: ./...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 14 16:56:34 2010
New Revision: 276533

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=276533
Log:
Merge changes from trunk.


Modified:
    team/mmichelson/acl-v6/   (props changed)
    team/mmichelson/acl-v6/channels/chan_h323.c

Propchange: team/mmichelson/acl-v6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 14 16:56:34 2010
@@ -1,1 +1,1 @@
-/trunk:1-276505
+/trunk:1-276532

Modified: team/mmichelson/acl-v6/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/acl-v6/channels/chan_h323.c?view=diff&rev=276533&r1=276532&r2=276533
==============================================================================
--- team/mmichelson/acl-v6/channels/chan_h323.c (original)
+++ team/mmichelson/acl-v6/channels/chan_h323.c Wed Jul 14 16:56:34 2010
@@ -621,7 +621,7 @@
 		ast_copy_string(pvt->options.cid_rdnis, c->redirecting.from.number.str, sizeof(pvt->options.cid_rdnis));
 	}
 
-	pvt->options.presentation = ast_party_id_presentation(c->connected.id);
+	pvt->options.presentation = ast_party_id_presentation(&c->connected.id);
 	pvt->options.type_of_number = c->connected.id.number.plan;
 
 	if ((addr = pbx_builtin_getvar_helper(c, "PRIREDIRECTREASON"))) {