[asterisk-commits] tilghman: trunk r43442 - in /trunk: ./ apps/app_rpt.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Sep 21 14:48:35 2006
New Revision: 43442

URL: http://svn.digium.com/view/asterisk?rev=43442&view=rev
Log:
Merged revisions 43441 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43441 | tilghman | 2006-09-21 14:43:32 -0500 (Thu, 21 Sep 2006) | 2 lines

Oops, missed the merge breakage

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_rpt.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep 21 14:48:35 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441

Modified: trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_rpt.c?rev=43442&r1=43441&r2=43442&view=diff
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Thu Sep 21 14:48:35 2006
@@ -1886,7 +1886,7 @@
 	const char *wait_times;
 	char *wait_times_save = NULL;
 
-	wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
+	wait_times = ast_variable_retrieve(myrpt->cfg, myrpt->name, "wait_times");
 
 	if (wait_times) {
 		wait_times_save = ast_strdupa(wait_times);
@@ -1899,28 +1899,28 @@
 	switch (type) {
 	case DLY_TELEM:
 		if (wait_times)
-			interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000);
+			interval = retrieve_astcfgint(myrpt, wait_times_save, "telemwait", 500, 5000, 1000);
 		else
 			interval = 1000;
 		break;
 
 	case DLY_ID:
 		if (wait_times)
-			interval = retrieve_astcfgint(wait_times_save, "idwait", 250, 5000, 500);
+			interval = retrieve_astcfgint(myrpt, wait_times_save, "idwait", 250, 5000, 500);
 		else
 			interval = 500;
 		break;
 
 	case DLY_UNKEY:
 		if (wait_times)
-			interval = retrieve_astcfgint(wait_times_save, "unkeywait", 500, 5000, 1000);
+			interval = retrieve_astcfgint(myrpt, wait_times_save, "unkeywait", 500, 5000, 1000);
 		else
 			interval = 1000;
 		break;
 
 	case DLY_CALLTERM:
 		if (wait_times)
-			interval = retrieve_astcfgint(wait_times_save, "calltermwait", 500, 5000, 1500);
+			interval = retrieve_astcfgint(myrpt, wait_times_save, "calltermwait", 500, 5000, 1500);
 		else
 			interval = 1500;
 		break;
@@ -1929,7 +1929,7 @@
 		return 0;
 	}
 	return interval;
-}														  
+}
 
 
 /*