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

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index e3a71c6..f64bc12 100644 (file)
--- 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;

diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 732199b..201f7fe 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -754,7 +754,7 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
        struct ast_channel *tmp;
        int fmt;
        int what;
-       char *str;
+       const char *str;
 
        if (title)
                str = title;