[svn-commits] twilson: trunk r294208 - in /trunk: ./ configs/ res/

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Nov  8 13:59:39 2010
New Revision: 294208

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294208
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/configs/calendar.conf.sample
    trunk/res/res_calendar.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/calendar.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/calendar.conf.sample?view=diff&rev=294208&r1=294207&r2=294208
==============================================================================
--- trunk/configs/calendar.conf.sample (original)
+++ trunk/configs/calendar.conf.sample Mon Nov  8 13:59:39 2010
@@ -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

Modified: trunk/res/res_calendar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar.c?view=diff&rev=294208&r1=294207&r2=294208
==============================================================================
--- trunk/res/res_calendar.c (original)
+++ trunk/res/res_calendar.c Mon Nov  8 13:59:39 2010
@@ -369,6 +369,7 @@
 
 	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 @@
 		} 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")) {