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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 14:43:00 2005
New Revision: 3541

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/load_config.cc
Log:
Update the configuration loader for wide characters.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 14:43:00 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/load_config.cc:
+
+	  Update the configuration loader for wide characters.
+
 	* src/download_list.cc, src/download_screen.cc:
 
 	  Allow the user to cancel a media change.  Although I can't

Modified: branches/aptitude-0.3/aptitude/src/load_config.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_config.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/load_config.cc	Sat Jul  2 14:43:00 2005
@@ -13,6 +13,8 @@
 #include <generic/apt.h>
 #include <generic/config_signal.h>
 
+#include <vscreen/transcode.h>
+
 #include <ctype.h>
 
 using namespace std;
@@ -162,10 +164,10 @@
 		newsplit=i->Value.find(',',split);
 		string currval(i->Value, split, newsplit-split);
 
-		chtype ch=parse_key(currval);
+		key k=parse_key(transcode(currval));
 
-		if(ch!=(chtype) ERR)
-		  newbinding.push_back(ch);
+		if(k.ch!=(wint_t) ERR)
+		  newbinding.push_back(k);
 		else
 		  _error->Error(_("Ignoring invalid keybinding \"%s\" -> \"%s\""), i->Tag.c_str(), currval.c_str());
 		split=newsplit+1;