Index: ChangeLog
===================================================================
RCS file: /cvs/cygwin-apps/setup/ChangeLog,v
retrieving revision 2.701
diff -u -p -r2.701 ChangeLog
--- ChangeLog	17 Apr 2010 12:36:46 -0000	2.701
+++ ChangeLog	22 Jul 2010 20:58:16 -0000
@@ -1,3 +1,13 @@
+2010-07-22  Andy.Koppe  <andy.koppe@gmail.com>
+
+	* PickPackageLine.cc (PickPackageLine::{click,set_action}):
+	Don't trigger automatic package selection when clicking on
+	packages or categories on chooser screen.
+	* PickCategoryLine.cc (PickCategoryLine::click): No more need to
+	prepare for automatic package selection with markUnVisited().
+	* res.rc: Drop "Warning!" from caption of Resolve Dependencies
+	screen.
+
 2010-04-17  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* root.cc (RootPage::OnNext): Don't construct a packagedb here nor
Index: PickCategoryLine.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/PickCategoryLine.cc,v
retrieving revision 2.11
diff -u -p -r2.11 PickCategoryLine.cc
--- PickCategoryLine.cc	13 Apr 2010 17:25:26 -0000	2.11
+++ PickCategoryLine.cc	22 Jul 2010 20:58:16 -0000
@@ -112,8 +112,6 @@ PickCategoryLine::click (int const myrow
 	{
 	  ++current_default;
 	  
-          packagedb().markUnVisited();
-
 	  return set_action (current_default);
 	}
       else
Index: PickPackageLine.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/PickPackageLine.cc,v
retrieving revision 2.22
diff -u -p -r2.22 PickPackageLine.cc
--- PickPackageLine.cc	13 Dec 2009 19:23:43 -0000	2.22
+++ PickPackageLine.cc	22 Jul 2010 20:58:16 -0000
@@ -136,14 +136,11 @@ PickPackageLine::click (int const myrow,
       && x <= theView.headers[theView.new_col + 1].x - HMARGIN / 2)
     pkg.set_action (pkg.trustp(theView.deftrust));
 
-  packagedb().markUnVisited();
-  /* Add any packages that are needed by this package */
-  /* TODO: This hardcoded TRUST_CURR does not seem right. */
-  return pkg.set_requirements (TRUST_CURR);
+  return 0;
 }
 
 int PickPackageLine::set_action (packagemeta::_actions action)
 {
-  pkg.set_action (action , pkg.trustp(theView.deftrust));
-  return pkg.set_requirements(theView.deftrust) + 1;
+  pkg.set_action (action, pkg.trustp(theView.deftrust));
+  return 1;
 }
Index: res.rc
===================================================================
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.83
diff -u -p -r2.83 res.rc
--- res.rc	7 Apr 2010 16:32:31 -0000	2.83
+++ res.rc	22 Jul 2010 20:58:16 -0000
@@ -383,7 +383,7 @@ BEGIN
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,
                     0,28,SETUP_STANDARD_DIALOG_W,1
     ICON            IDI_CYGWIN,IDC_HEADICON,SETUP_HEADICON_X,0,21,20
-    LTEXT           "Warning!  Unmet Dependencies Found",IDC_STATIC_HEADER_TITLE
+    LTEXT           "Unmet Dependencies Found",IDC_STATIC_HEADER_TITLE
                     ,7,0,258,8,NOT WS_GROUP
     LTEXT           "The following packages are required but have not been "
                     "selected.",IDC_STATIC,21,9,239,16,NOT WS_GROUP