remove some extraneous 'followme' in prompt names

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39206 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 42986c96fbb79ca664393d2268055ac5f9739cae..09fb451692bdc188b8b59b5787b3f0ab4c376d87 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -158,10 +158,10 @@ static const char *defaultmoh = "default";        /*!< Default Music-On-Hold Class
 static char takecall[20] = "1", nextindp[20] = "2";
 static char callfromprompt[PATH_MAX] = "followme/call-from";
 static char norecordingprompt[PATH_MAX] = "followme/no-recording";
-static char optionsprompt[PATH_MAX] = "followme/followme-options";
+static char optionsprompt[PATH_MAX] = "followme/options";
 static char plsholdprompt[PATH_MAX] = "followme/pls-hold-while-try";
-static char statusprompt[PATH_MAX] = "followme/followme-status";
-static char sorryprompt[PATH_MAX] = "followme/followme-sorry";
+static char statusprompt[PATH_MAX] = "followme/status";
+static char sorryprompt[PATH_MAX] = "followme/sorry";
 
 
 static AST_LIST_HEAD_STATIC(followmes, ast_call_followme);
@@ -327,23 +327,23 @@ static int reload_followme(void)
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(callfromprompt, tmpstr, sizeof(callfromprompt));
 
-       tmpstr = ast_variable_retrieve(cfg, "general", "followme-norecording-prompt");
+       tmpstr = ast_variable_retrieve(cfg, "general", "norecording-prompt");
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(norecordingprompt, tmpstr, sizeof(norecordingprompt));
 
-       tmpstr = ast_variable_retrieve(cfg, "general", "followme-options-prompt");
+       tmpstr = ast_variable_retrieve(cfg, "general", "options-prompt");
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(optionsprompt, tmpstr, sizeof(optionsprompt));
 
-       tmpstr = ast_variable_retrieve(cfg, "general", "followme-pls-hold-prompt");
+       tmpstr = ast_variable_retrieve(cfg, "general", "pls-hold-prompt");
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(plsholdprompt, tmpstr, sizeof(plsholdprompt));
 
-       tmpstr = ast_variable_retrieve(cfg, "general", "followme-status-prompt");
+       tmpstr = ast_variable_retrieve(cfg, "general", "status-prompt");
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(statusprompt, tmpstr, sizeof(statusprompt));
 
-       tmpstr = ast_variable_retrieve(cfg, "general", "followme-sorry-prompt");
+       tmpstr = ast_variable_retrieve(cfg, "general", "sorry-prompt");
        if (!ast_strlen_zero(tmpstr))
                ast_copy_string(sorryprompt, tmpstr, sizeof(sorryprompt));
 

diff --git a/configs/followme.conf.sample b/configs/followme.conf.sample
index 5c75efdf1832deb31e2f78ea12fba5a1939ba3a7..5d6d02c3e0c01110df408d18a270be8faa73c293 100644 (file)
--- a/configs/followme.conf.sample
+++ b/configs/followme.conf.sample
@@ -16,20 +16,20 @@ declinecall=>2
 call-from-prompt=>followme/call-from
 ; The global default for the 'Incoming call from' message.
 ;
-followme-norecording-prompt=>followme/no-recording
+norecording-prompt=>followme/no-recording
 ; The global default for the 'You have an incoming call' message when the caller elects
 ; not to leave their name or the option isn't set for them to do so.
 ;
-followme-options-prompt=>followme/followme-options
+options-prompt=>followme/options
 ; The global default for the 'Press 1 to accept this call or press 2 to decline it' message.
 ;
-followme-pls-hold-prompt=>followme/pls-hold-while-try
+pls-hold-prompt=>followme/pls-hold-while-try
 ; The global default for 'Please hold while we try and connect your call' message.
 ;
-followme-status-prompt=>followme/followme-status
+status-prompt=>followme/status
 ; The global default for 'The party you're calling isn't at their desk' message.
 ;
-followme-sorry-prompt=>followme/followme-sorry  
+sorry-prompt=>followme/sorry  
 ; The global default for 'I'm sorry, but we were unable to locate your party' message.
 ;
 ;