diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-31 00:15:09 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-31 00:15:09 +0000 |
| commit | 2ee4276f3b65364078d11dc28f3accab56bd2fb8 (patch) | |
| tree | 21c8a0c2f7dfce50c7dd6a251497cbbc5db3d3d3 /res | |
| parent | 739550eb035e3081d45df7ac1f244eddf82a3017 (diff) | |
Rename new parkedcallparking option to parkedcallreparking
Since this option actually already existed in 1.6.0+, use the same name so as
not to confuse people when they upgrade
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@172639 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/res_features.c b/res/res_features.c index b66054214..2e369659e 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -94,7 +94,7 @@ static int parking_start; /*!< First available static int parking_stop; /*!< Last available extension for parking */ static int parkedcalltransfers; /*!< Who can REDIRECT after picking up a parked a call */ -static int parkedcallparking; /*!< Who can PARKCALL after picking up a parked call */ +static int parkedcallreparking; /*!< Who can PARKCALL after picking up a parked call */ static int parkedcallhangup; /*!< Who can DISCONNECT after picking up a parked call */ static int parkedcallrecording; /*!< Who can AUTOMON after picking up a parked call */ @@ -2433,10 +2433,10 @@ static int park_exec(struct ast_channel *chan, void *data) if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLER) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH)) { ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT); } - if ((parkedcallparking == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallparking == AST_FEATURE_FLAG_BYBOTH)) { + if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH)) { ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL); } - if ((parkedcallparking == AST_FEATURE_FLAG_BYCALLER) || (parkedcallparking == AST_FEATURE_FLAG_BYBOTH)) { + if ((parkedcallreparking == AST_FEATURE_FLAG_BYCALLER) || (parkedcallreparking == AST_FEATURE_FLAG_BYBOTH)) { ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL); } if ((parkedcallhangup == AST_FEATURE_FLAG_BYCALLEE) || (parkedcallhangup == AST_FEATURE_FLAG_BYBOTH)) { @@ -2742,7 +2742,7 @@ static int load_config(void) adsipark = 0; parkaddhints = 0; parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH; - parkedcallparking = 0; + parkedcallreparking = 0; parkedcallhangup = 0; parkedcallrecording = 0; @@ -2786,15 +2786,15 @@ static int load_config(void) parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE; else if (!strcasecmp(var->value, "both")) parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH; - } else if (!strcasecmp(var->name, "parkedcallparking")) { + } else if (!strcasecmp(var->name, "parkedcallreparking")) { if (!strcasecmp(var->value, "no")) - parkedcallparking = 0; + parkedcallreparking = 0; else if (!strcasecmp(var->value, "caller")) - parkedcallparking = AST_FEATURE_FLAG_BYCALLER; + parkedcallreparking = AST_FEATURE_FLAG_BYCALLER; else if (!strcasecmp(var->value, "callee")) - parkedcallparking = AST_FEATURE_FLAG_BYCALLEE; + parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE; else if (!strcasecmp(var->value, "both")) - parkedcallparking = AST_FEATURE_FLAG_BYBOTH; + parkedcallreparking = AST_FEATURE_FLAG_BYBOTH; } else if (!strcasecmp(var->name, "parkedcallhangup")) { if (!strcasecmp(var->value, "no")) parkedcallhangup = 0; |