[Asterisk-cvs] asterisk/apps app_dial.c,1.94.2.4,1.94.2.5
russell at lists.digium.com
russell at lists.digium.com
Wed Feb 9 16:53:16 CST 2005
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv27458/apps
Modified Files:
Tag: v1-0
app_dial.c
Log Message:
preserve original callerid functionality for 1.0 (bug #3490)
Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.94.2.4
retrieving revision 1.94.2.5
diff -u -d -r1.94.2.4 -r1.94.2.5
--- app_dial.c 29 Jan 2005 06:46:05 -0000 1.94.2.4
+++ app_dial.c 9 Feb 2005 22:53:30 -0000 1.94.2.5
@@ -281,9 +281,6 @@
ast_hangup(o->chan);
o->chan = NULL;
numnochan++;
- } else {
- /* After calling, set callerid to extension */
- ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, 0);
}
}
/* Hangup the original channel now, in case we needed it */
@@ -849,11 +846,9 @@
free(tmp);
cur = rest;
continue;
- } else {
+ } else
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
- ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, 0);
- }
/* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get
hung up XXX */
More information about the svn-commits
mailing list