diff options
| author | Terry Wilson <twilson@digium.com> | 2010-11-08 19:59:39 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-11-08 19:59:39 +0000 |
| commit | aa0f407b8bfdfa7e28edcf6489faee02d191dc0e (patch) | |
| tree | da283574c6338a46ea1f4f224cf1fb93a84026b5 /res/res_calendar.c | |
| parent | 18553bb80491592ceadcfc9479e4501837dc3bb6 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@294208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_calendar.c')
| -rw-r--r-- | res/res_calendar.c | 6 |
1 files changed, 5 insertions, 1 deletions
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")) { |