[Aptitude-svn-commit] r3383 - in branches/aptitude-0.3/aptitude: . src

Daniel Burrows dburrows@costa.debian.org
Tue, 07 Jun 2005 19:04:15 +0000


Author: dburrows
Date: Tue Jun  7 19:04:12 2005
New Revision: 3383

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/load_config.h
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Use load_styles, not load_colors.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 19:04:12 2005
@@ -1,5 +1,9 @@
 2005-06-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/load_config.h, src/ui.cc:
+
+	Call load_styles from ui.cc, not load_colors.
+
 	* src/view_changelog.cc:
 
 	Update the changelog viewer for the new display code.

Modified: branches/aptitude-0.3/aptitude/src/load_config.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_config.h	(original)
+++ branches/aptitude-0.3/aptitude/src/load_config.h	Tue Jun  7 19:04:12 2005
@@ -9,7 +9,7 @@
 
 #include "vscreen/config/keybindings.h"
 
-void load_colors(std::string group, bool usetheme);
+void load_styles(std::string group, bool usetheme);
 //  Loads in color definitions from the given group.
 
 void load_bindings(std::string group, keybindings *toload, bool usetheme);

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Tue Jun  7 19:04:12 2005
@@ -1585,7 +1585,7 @@
 
 static void load_options(string base, bool usetheme)
 {
-  load_colors(base+"::Colors", usetheme);
+  load_styles(base+"::Styles", usetheme);
   load_bindings(base+"::Keybindings", &global_bindings, usetheme);
   load_bindings(base+"::Keybindings::EditLine", vs_editline::bindings, usetheme);
   load_bindings(base+"::Keybindings::Menu", vs_menu::bindings, usetheme);