[asterisk-commits] rmudgett: branch group/v14_colp r152289 - in /team/group/v14_colp: ./ channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Oct 27 18:38:25 2008
New Revision: 152289

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152289
Log:
Resolved conflict to inherit all fields.

Merged revisions 152215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
  
  Inherit ALL elements of CallerID across a local channel.
  (closes issue #13368)
   Reported by: Peter Schlaile
   Patches:
         20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)


Modified:
    team/group/v14_colp/   (props changed)
    team/group/v14_colp/channels/chan_local.c

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/v14_colp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 27 18:38:25 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-152079
+/branches/1.4:1-152285

Modified: team/group/v14_colp/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_local.c?view=diff&rev=152289&r1=152288&r2=152289
==============================================================================
--- team/group/v14_colp/channels/chan_local.c (original)
+++ team/group/v14_colp/channels/chan_local.c Mon Oct 27 18:38:25 2008
@@ -476,6 +476,7 @@
 	p->chan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis);
 	ast_party_redirecting_copy(&p->chan->redirecting, &p->owner->redirecting);
 
+	p->chan->cid.cid_dnid = ast_strdup(p->owner->cid.cid_dnid);
 	p->chan->cid.cid_tns = p->owner->cid.cid_tns;
 
 	ast_copy_connected_to_caller(&p->chan->cid, &p->owner->connected);