[asterisk-commits] twilson: branch 1.4 r172639 - in /branches/1.4: configs/ res/

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Jan 30 18:15:09 2009
New Revision: 172639

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

Modified:
    branches/1.4/configs/features.conf.sample
    branches/1.4/res/res_features.c

Modified: branches/1.4/configs/features.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/configs/features.conf.sample?view=diff&rev=172639&r1=172638&r2=172639
==============================================================================
--- branches/1.4/configs/features.conf.sample (original)
+++ branches/1.4/configs/features.conf.sample Fri Jan 30 18:15:09 2009
@@ -17,7 +17,7 @@
 				; one of: parked, caller, both  (default is caller)
 ;parkedcalltransfers = caller   ; Enables or disables DTMF based transfers when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is both)
-;parkedcallparking = caller     ; Enables or disables DTMF based one-touch parking when picking up a parked call.
+;parkedcallreparking = caller   ; Enables or disables DTMF based one-touch parking when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallhangup = caller      ; Enables or disables DTMF based hangups when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=172639&r1=172638&r2=172639
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Fri Jan 30 18:15:09 2009
@@ -94,7 +94,7 @@
 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 @@
 		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 @@
 	adsipark = 0;
 	parkaddhints = 0;
 	parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH;
-	parkedcallparking = 0;
+	parkedcallreparking = 0;
 	parkedcallhangup = 0;
 	parkedcallrecording = 0;
 
@@ -2786,15 +2786,15 @@
 				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;