diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-11-08 07:21:45 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-11-08 07:21:45 +0000 |
commit | c8597704cecb9c96a83f6a4af2438a94b7ce03a3 (patch) | |
tree | b02a6f0662673b6a019ab60bb4d12d37f86b41d2 /channels/chan_gtalk.c | |
parent | 6676c55a6698d1fb9562c5236ca1d35c27700481 (diff) |
fix compilation.
Overall i think the previous change to ast_channel_alloc()
to close bug 7506 should have been done by defining
an ast_set_callerid_noevent() function that does the
setting without generating the event.
Lot less code duplication, and easier to handle.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
-rw-r--r-- | channels/chan_gtalk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index e3a71c624..f64bc125b 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -895,7 +895,7 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, struct ast_channel *tmp; int fmt; int what; - char *n2; + const char *n2; if (title) n2 = title; @@ -953,9 +953,9 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); /* Don't use ast_set_callerid() here because it will * generate a needless NewCallerID event */ - tmp->cid.cid_num = ast_strdup(l->cid_num); - tmp->cid.cid_ani = ast_strdup(l->cid_num); - tmp->cid.cid_name = ast_strdup(l->cid_name); + tmp->cid.cid_num = ast_strdup(i->cid_num); + tmp->cid.cid_ani = ast_strdup(i->cid_num); + tmp->cid.cid_name = ast_strdup(i->cid_name); if (!ast_strlen_zero(i->exten) && strcmp(i->exten, "s")) tmp->cid.cid_dnid = ast_strdup(i->exten); tmp->priority = 1; |