mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-06 01:45:11 +00:00
Merged revisions 168562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines Merged revisions 168561 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines Revert unnecessary indications API change from rev 122314 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -102,7 +102,7 @@ AST_APP_OPTIONS(app_opts, {
|
||||
|
||||
static void play_dialtone(struct ast_channel *chan, char *mailbox)
|
||||
{
|
||||
const struct ind_tone_zone_sound *ts = NULL;
|
||||
const struct tone_zone_sound *ts = NULL;
|
||||
if(ast_app_has_voicemail(mailbox, NULL))
|
||||
ts = ast_get_indication_tone(chan->zone, "dialrecall");
|
||||
else
|
||||
|
||||
@@ -86,7 +86,7 @@ static int read_exec(struct ast_channel *chan, void *data)
|
||||
int tries = 1, to = 0, x = 0;
|
||||
double tosec;
|
||||
char *argcopy = NULL;
|
||||
struct ind_tone_zone_sound *ts = NULL;
|
||||
struct tone_zone_sound *ts = NULL;
|
||||
struct ast_flags flags = {0};
|
||||
const char *status = "ERROR";
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ static int readexten_exec(struct ast_channel *chan, void *data)
|
||||
int maxdigits = sizeof(exten) - 1;
|
||||
int timeout = 0, digit_timeout = 0, x = 0;
|
||||
char *argcopy = NULL, *status = "";
|
||||
struct ind_tone_zone_sound *ts = NULL;
|
||||
struct tone_zone_sound *ts = NULL;
|
||||
struct ast_flags flags = {0};
|
||||
|
||||
AST_DECLARE_APP_ARGS(arglist,
|
||||
|
||||
Reference in New Issue
Block a user