[asterisk-commits] jpeeler: branch 1.6.2 r250980 - in /branches/1.6.2: ./ apps/app_followme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Mar  5 13:11:25 2010
New Revision: 250980

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250980
Log:
Merged revisions 250979 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250979 | jpeeler | 2010-03-05 13:10:47 -0600 (Fri, 05 Mar 2010) | 9 lines
  
  Fix app_followme playing wrong sound files.
  
  Fixes regression introduced in 140167 that uses the wrong variable names.
  
  (closes issue #16930)
  Reported by: ianc
  Patches: 
        fix_reload_followme.diff uploaded by ianc (license 998)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_followme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_followme.c?view=diff&rev=250980&r1=250979&r2=250980
==============================================================================
--- branches/1.6.2/apps/app_followme.c (original)
+++ branches/1.6.2/apps/app_followme.c Fri Mar  5 13:11:25 2010
@@ -354,7 +354,7 @@
 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt")) && !ast_strlen_zero(tmpstr)) {
 		ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "norecording_prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(callfromprompt, tmpstr, sizeof(callfromprompt));
+		ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
 	}
 
 
@@ -365,21 +365,21 @@
 	}
 
 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls-hold-prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "pls_hold_prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
 	}
 
 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "status-prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "status_prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
 	}
 
 	if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry-prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
 	} else if ((tmpstr = ast_variable_retrieve(cfg, "general", "sorry_prompt")) && !ast_strlen_zero(tmpstr)) {
-		ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
+		ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
 	}
 
 	/* Chug through config file */