[Aptitude-svn-commit] r4278 - in branches/aptitude-0.3/aptitude: . src/vscreen/config

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 05:39:55 2005
New Revision: 4278

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
Log:
Actually set default_colors_avail to true.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 05:39:55 2005
@@ -1,5 +1,12 @@
 2005-09-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/config/colors.cc:
+
+	  Actually set default_colors_avail based on the result of
+	  use_default_colors().  The codepath where this value is false is
+	  untested, because I can't seem to find a terminal that doesn't
+	  provide default colors.
+
 	* src/ui.cc:
 
 	  Connect up the new cache functions to display a helpful (?)

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc	Mon Sep 26 05:39:55 2005
@@ -28,10 +28,11 @@
 
 void init_colors()
 {
-  if(COLOR_PAIRS<COLORS*COLORS || use_default_colors() == ERR)
+  if(COLOR_PAIRS<COLORS*COLORS)
     return;
 
   colors_avail=true;
+  default_colors_avail = (use_default_colors() != ERR);
 
   for(short fg=0; fg<COLORS; ++fg)
     for(short bg=0; bg<COLORS; ++bg)