[svn-commits] russell: trunk r478 - /trunk/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Feb 12 13:24:14 2009
New Revision: 478

URL: http://svn.digium.com/svn-view/menuselect?view=rev&rev=478
Log:
Merged revisions 477 via svnmerge from 
https://origsvn.digium.com/svn/menuselect/branches/1.0

........
  r477 | russell | 2009-02-12 13:23:34 -0600 (Thu, 12 Feb 2009) | 4 lines
  
  Revert back to revision 464, as I am still having problems with the changes.
  
  (related to issue #14137)
........

Modified:
    trunk/   (props changed)
    trunk/menuselect.c
    trunk/menuselect.h
    trunk/menuselect_curses.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Thu Feb 12 13:24:14 2009
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383,437,465,467,473,475
+/branches/1.0:1-316,383,437,465,467,473,475,477

Modified: trunk/menuselect.c
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.c?view=diff&rev=478&r1=477&r2=478
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Thu Feb 12 13:24:14 2009
@@ -770,7 +770,6 @@
 		AST_LIST_TRAVERSE(&cat->members, mem, list) {
 			if (!strcmp(member, mem->name)) {
 				mem->was_enabled = mem->enabled = (negate ? !cat->positive_output : cat->positive_output);
-				mem->was_present = 1;
 				print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
 				break;
 			}
@@ -1393,17 +1392,14 @@
 
 	AST_LIST_TRAVERSE(&categories, cat, list) {
 		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (!mem->defaultenabled || mem->was_present) {
+			if (!mem->defaultenabled)
 				continue;
-			}
-
-			if (mem->depsfailed == HARD_FAILURE) {
+
+			if (mem->depsfailed == HARD_FAILURE)
 				continue;
-			}
-
-			if (mem->conflictsfailed == HARD_FAILURE) {
+
+			if (mem->conflictsfailed == HARD_FAILURE)
 				continue;
-			}
 			
 			if (!strcasecmp(mem->defaultenabled, "yes")) {
 				mem->enabled = 1;
@@ -1447,9 +1443,8 @@
 			check_deps = 1;
 		else {
 			res = parse_existing_config(argv[x]);
-			if (!res && !strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT)) {
+			if (!res && !strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT))
 				existing_config = 1;
-			}
 			res = 0;
 		}
 	}
@@ -1459,11 +1454,10 @@
 
 	while (calc_dep_failures(0, 0) || calc_conflict_failures(0, 0));
 
-	process_defaults();
-	
-	if (check_deps && existing_config) {
+	if (!existing_config)
+		process_defaults();
+	else if (check_deps)
 		res = sanity_check();
-	}
 
 	while (calc_dep_failures(0, 0) || calc_conflict_failures(0, 0));
 	

Modified: trunk/menuselect.h
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.h?view=diff&rev=478&r1=477&r2=478
==============================================================================
--- trunk/menuselect.h (original)
+++ trunk/menuselect.h Thu Feb 12 13:24:14 2009
@@ -96,9 +96,6 @@
 	  we have included it in the MENUSELECT_BUILD_DEPS line
 	  in the output file */
 	unsigned int build_deps_output:1;
-	/*! This member was present in an existing configuration file, so don't
-	 * mess with it when processing default values. */
-	unsigned int was_present:1;
 	/*! dependencies of this module */
 	AST_LIST_HEAD_NOLOCK(, depend) deps;
 	/*! conflicts of this module */

Modified: trunk/menuselect_curses.c
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect_curses.c?view=diff&rev=478&r1=477&r2=478
==============================================================================
--- trunk/menuselect_curses.c (original)
+++ trunk/menuselect_curses.c Thu Feb 12 13:24:14 2009
@@ -875,7 +875,7 @@
 		}
 		repaint_screen();
 		jiffies++;
-		usleep(2000);
+		usleep(1000);
 	}
 
 	while ((blip = AST_LIST_REMOVE_HEAD(&blips, entry)))