[svn-commits] rizzo: trunk r47306 - in /trunk/channels: chan_gtalk.c chan_jingle.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Wed Nov  8 01:21:45 2006
New Revision: 47306

URL: http://svn.digium.com/view/asterisk?rev=47306&view=rev
Log:
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.


Modified:
    trunk/channels/chan_gtalk.c
    trunk/channels/chan_jingle.c

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?rev=47306&r1=47305&r2=47306&view=diff
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Wed Nov  8 01:21:45 2006
@@ -895,7 +895,7 @@
 	struct ast_channel *tmp;
 	int fmt;
 	int what;
-	char *n2;
+	const char *n2;
 
 	if (title)
 		n2 = title;
@@ -953,9 +953,9 @@
 	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;

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?rev=47306&r1=47305&r2=47306&view=diff
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Wed Nov  8 01:21:45 2006
@@ -754,7 +754,7 @@
 	struct ast_channel *tmp;
 	int fmt;
 	int what;
-	char *str;
+	const char *str;
 
 	if (title)
 		str = title;