[svn-commits] qwell: trunk r79903 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Aug 17 12:45:01 2007
New Revision: 79903

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79903
Log:
Merged revisions 79902 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10485)
........
r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines

Re-add the setting of callerid name and number.

Issue 10485, reported by and fix explained by paradise.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=79903&r1=79902&r2=79903
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Fri Aug 17 12:45:01 2007
@@ -453,6 +453,12 @@
 	
 	ast_mutex_lock(&p->lock);
 
+	/*
+	 * Note that cid_num and cid_name aren't passed in the ast_channel_alloc
+	 * call, so it's done here instead.
+	 */
+	p->chan->cid.cid_num = ast_strdup(p->owner->cid.cid_num);
+	p->chan->cid.cid_name = ast_strdup(p->owner->cid.cid_name);
 	p->chan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis);
 	p->chan->cid.cid_ani = ast_strdup(p->owner->cid.cid_ani);
 	p->chan->cid.cid_pres = p->owner->cid.cid_pres;