diff options
Diffstat (limited to 'channels/chan_jingle.c')
-rw-r--r-- | channels/chan_jingle.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 560d3ec17..d57644cb1 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -853,7 +853,8 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * tmp->callgroup = client->callgroup; tmp->pickupgroup = client->pickupgroup; - tmp->cid.cid_pres = client->callingpres; + tmp->caller.id.name.presentation = client->callingpres; + tmp->caller.id.number.presentation = client->callingpres; if (!ast_strlen_zero(client->accountcode)) ast_string_field_set(tmp, accountcode, client->accountcode); if (client->amaflags) @@ -867,9 +868,10 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt * ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); /* Don't use ast_set_callerid() here because it will * generate an unnecessary NewCallerID event */ - tmp->cid.cid_ani = ast_strdup(i->cid_num); - if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) - tmp->cid.cid_dnid = ast_strdup(i->exten); + tmp->caller.ani = ast_strdup(i->cid_num); + if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) { + tmp->dialed.number.str = ast_strdup(i->exten); + } tmp->priority = 1; if (i->rtp) ast_jb_configure(tmp, &global_jbconf); |