diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-03 04:25:21 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-03 04:25:21 +0000 |
| commit | 4c50c16addfc846eefccf8d517e696a23e869bd1 (patch) | |
| tree | 9e29310d1f0916eaa0b2301492a9ed5f1c5e093a /channels/chan_jingle.c | |
| parent | 9f9c7882f4f3b0b592576b1f9a44a44b77c4d472 (diff) | |
Blocked revisions 36725 via svnmerge
........
r36725 | russell | 2006-07-03 00:19:09 -0400 (Mon, 03 Jul 2006) | 4 lines
use ast_set_callerid to be more consistent and to make sure that the
"callerid" option in the conf files is always handled the same way and sets ANI
(issue #7285, gkloepfer)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36726 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 16bd521da..c5957e399 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -761,10 +761,7 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * ast_mutex_unlock(&usecnt_lock); ast_copy_string(tmp->context, client->context, sizeof(tmp->context)); ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); - if (!ast_strlen_zero(i->cid_num)) - tmp->cid.cid_num = ast_strdup(i->cid_num); - if (!ast_strlen_zero(i->cid_name)) - tmp->cid.cid_name = ast_strdup(i->cid_name); + ast_set_callerid(tmp, i->cid_num, i->cid_name, i->cid_num); if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) tmp->cid.cid_dnid = ast_strdup(i->exten); tmp->priority = 1; |