diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-02-27 16:50:19 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-02-27 16:50:19 +0000 |
| commit | 1fac2fba4b8f3decd83d738e974280aa92b50bcc (patch) | |
| tree | 114ec337f0210035993f29b81d1c704ff1ad7242 /apps/app_followme.c | |
| parent | 3cf09f40f749c8889de7d2b1aadf05d122ccba4f (diff) | |
Deprecated macro usage for connected line, redirecting, and CCSS
This commit adds GoSub alternatives to connected line, redirecting, and CCSS
macro hooks so that macro can finally be deprecated. This also adds
deprecation warnings for those features when used and in documentation.
Review: https://reviewboard.asterisk.org/r/1760/
(closes issue SWP-4256)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_followme.c')
| -rw-r--r-- | apps/app_followme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_followme.c b/apps/app_followme.c index 1bf9547a9..dc824f573 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -1304,7 +1304,8 @@ static int app_exec(struct ast_channel *chan, const char *data) /* Update connected line to caller if available. */ if (targs.pending_out_connected_update) { - if (ast_channel_connected_line_macro(outbound, caller, &targs.connected_out, 1, 0)) { + if (ast_channel_connected_line_sub(outbound, caller, &targs.connected_out, 0) && + ast_channel_connected_line_macro(outbound, caller, &targs.connected_out, 1, 0)) { ast_channel_update_connected_line(caller, &targs.connected_out, NULL); } } @@ -1329,7 +1330,8 @@ static int app_exec(struct ast_channel *chan, const char *data) /* Update connected line to winner if changed. */ if (targs.pending_in_connected_update) { - if (ast_channel_connected_line_macro(caller, outbound, &targs.connected_in, 0, 0)) { + if (ast_channel_connected_line_sub(caller, outbound, &targs.connected_in, 0) && + ast_channel_connected_line_macro(caller, outbound, &targs.connected_in, 0, 0)) { ast_channel_update_connected_line(outbound, &targs.connected_in, NULL); } } |