diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-08 19:56:10 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-08 19:56:10 +0000 |
| commit | bf95387c4b13c60db91fc55505bbd7b4e1bb3a78 (patch) | |
| tree | b2c361ed69da8c5959e09aa35bb29fc29b605683 | |
| parent | b88c7dfec66c73cd3d1875d6f447758f842a6161 (diff) | |
Set a default waittime, and make sure to convert it to milliseconds
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@294207 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | configs/calendar.conf.sample | 6 | ||||
| -rw-r--r-- | res/res_calendar.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/configs/calendar.conf.sample b/configs/calendar.conf.sample index 359e4d9d6..ad3ce0983 100644 --- a/configs/calendar.conf.sample +++ b/configs/calendar.conf.sample @@ -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 diff --git a/res/res_calendar.c b/res/res_calendar.c index 183b40845..5457f86f8 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -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")) { |