diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-04-01 17:00:50 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-04-01 17:00:50 +0000 |
| commit | 474f5219a91fae822bf69c9d1da005abbc4a945e (patch) | |
| tree | d617e28cb24f28da6a845cef57f336e777d4f97c /apps | |
| parent | 1d8d739641e383a6b331a933227f191a5c7d0a40 (diff) | |
Merging in xylome's beaerer capabilty patch (bug 3547)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5342 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/Makefile | 2 | ||||
| -rwxr-xr-x | apps/app_dial.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/Makefile b/apps/Makefile index 0feec316d..2f6a875dc 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -31,7 +31,7 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\ app_talkdetect.so app_alarmreceiver.so app_userevent.so app_verbose.so \ app_test.so app_forkcdr.so app_math.so app_realtime.so \ app_dumpchan.so app_waitforsilence.so app_while.so app_setrdnis.so \ - app_md5.so app_readfile.so app_chanspy.so + app_md5.so app_readfile.so app_chanspy.so app_settransfercapability.so ifneq (${OSARCH},Darwin) ifneq (${OSARCH},SunOS) diff --git a/apps/app_dial.c b/apps/app_dial.c index 9ee512ca5..9f7dedbdd 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -77,8 +77,8 @@ static char *descrip = " 'r' -- indicate ringing to the calling party, pass no audio until answered.\n" " 'm[(class)]' -- provide hold music to the calling party until answered (optionally\n" " with the specified class.\n" -" 'M(x[^arg]) -- Executes the macro (x with ^ delim arg list) upon connect of the call.\n" -" Also, the macro can set the MACRO_RESULT variable to do the following:\n" +" 'M(x[^arg])' -- Executes the macro (x with ^ delim arg list) upon connect of the call.\n" +" Also, the macro can set the MACRO_RESULT variable to do the following:\n" " -- ABORT - Hangup both legs of the call.\n" " -- CONGESTION - Behave as if line congestion was encountered.\n" " -- BUSY - Behave as if a busy signal was encountered. (n+101)\n" @@ -1039,8 +1039,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags tmp->chan->cid.cid_tns = chan->cid.cid_tns; /* Presense of ADSI CPE on outgoing channel follows ours */ tmp->chan->adsicpe = chan->adsicpe; - /* pass the digital flag */ - ast_copy_flags(tmp->chan, chan, AST_FLAG_DIGITAL); + /* Pass the transfer capability */ + tmp->chan->transfercapability = chan->transfercapability; /* If we have an outbound group, set this peer channel to it */ if (outbound_group) |