preserve original callerid functionality for 1.0 (bug #3490)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4994 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 505bfff0c545cf152ab02d8a94a732890047caa8..76ae6a5d494e10caf2241f23cc277ebde6712bea 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -281,9 +281,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
                                                        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 @@ static int dial_exec(struct ast_channel *chan, void *data)
                        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 */