dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 294207 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294207 | twilson | 2010-11-08 13:56:10 -0600 (Mon, 08 Nov 2010) | 2 lines
  
  Set a default waittime, and make sure to convert it to milliseconds
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@294208 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
twilson 2010-11-08 19:59:39 +00:00
parent 8a588a39cf
commit d26e0a5264
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/calendar.conf.sample
View File

@ -31,7 +31,7 @@
;app = Playback ; Application to execute on answer (instead of context/extension)
;appdata = tt-weasels ; Data part of application to execute on answer
;
;waittime = 30 ; How long to wait for an answer
;waittime = 30 ; How long to wait for an answer, defaults to 30 seconds
;[calendar2]
; Note: Support for Exchange Server 2003
@ -76,7 +76,7 @@
;app = Playback ; Application to execute on answer (instead of context/extension)
;appdata = tt-weasels ; Data part of application to execute on answer
;
;waittime = 30 ; How long to wait for an answer
;waittime = 30 ; How long to wait for an answer, defaults to 30 seconds
;[calendar4]
;type = caldav ; type of calendar--currently supported: ical, caldav, exchange, or ews
@ -99,4 +99,4 @@
;app = Playback ; Application to execute on answer (instead of context/extension)
;appdata = tt-weasels ; Data part of application to execute on answer
;
;waittime = 30 ; How long to wait for an answer
;waittime = 30 ; How long to wait for an answer, defaults to 30 seconds

6
res/res_calendar.c
View File

@ -369,6 +369,7 @@ static struct ast_calendar *build_calendar(struct ast_config *cfg, const char *c
cal->refresh = 3600;
cal->timeframe = 60;
cal->notify_waittime = 30000;
for (v = ast_variable_browse(cfg, cat); v; v = v->next) {
if (!strcasecmp(v->name, "autoreminder")) {
@ -380,7 +381,10 @@ static struct ast_calendar *build_calendar(struct ast_config *cfg, const char *c
} else if (!strcasecmp(v->name, "extension")) {
ast_string_field_set(cal, notify_extension, v->value);
} else if (!strcasecmp(v->name, "waittime")) {
cal->notify_waittime = atoi(v->value);
int i = atoi(v->value);
if (i > 0) {
cal->notify_waittime = 1000 * i;
}
} else if (!strcasecmp(v->name, "app")) {
ast_string_field_set(cal, notify_app, v->value);
} else if (!strcasecmp(v->name, "appdata")) {