[asterisk-commits] trunk r32281 - in /trunk: configs/extensions.conf.sample pbx/pbx_config.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jun  5 09:00:13 2006
New Revision: 32281

URL: http://svn.digium.com/view/asterisk?rev=32281&view=rev
Log:
it's time... only enable global priority jumping if the config file says to do so

Modified:
    trunk/configs/extensions.conf.sample
    trunk/pbx/pbx_config.c

Modified: trunk/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/extensions.conf.sample?rev=32281&r1=32280&r2=32281&view=diff
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Mon Jun  5 09:00:13 2006
@@ -50,7 +50,7 @@
 ; of Asterisk). Individual applications can also be requested to do this
 ; by passing a 'j' option in their arguments.
 ;
-priorityjumping=no
+;priorityjumping=yes
 ;
 ; You can include other config files, use the #include command
 ; (without the ';'). Note that this is different from the "include" command

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?rev=32281&r1=32280&r2=32281&view=diff
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Mon Jun  5 09:00:13 2006
@@ -1358,7 +1358,7 @@
 	write_protect_config = ast_true(ast_variable_retrieve(cfg, "general", "writeprotect"));
 	autofallthrough_config = ast_true(ast_variable_retrieve(cfg, "general", "autofallthrough"));
 	clearglobalvars_config = ast_true(ast_variable_retrieve(cfg, "general", "clearglobalvars"));
-	ast_set2_flag(&ast_options, !ast_false(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING);
+	ast_set2_flag(&ast_options, ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING);
 								    
 	for (v = ast_variable_browse(cfg, "globals"); v; v = v->next) {
 		memset(realvalue, 0, sizeof(realvalue));