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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun 25 18:07:59 2005
New Revision: 3429

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/transcode.cc
Log:
Use the correct charset to transcode.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun 25 18:07:59 2005
@@ -1,5 +1,10 @@
 2005-06-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/transcode.cc:
+
+	  Use nl_langinfo(), not localeset(), to find out what the current
+	  charset is when transcoding.
+
 	* src/vscreen/curses++.cc:
 
 	  Fix the generation of attributes+wide characters to preserve

Modified: branches/aptitude-0.3/aptitude/src/vscreen/transcode.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/transcode.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/transcode.cc	Sat Jun 25 18:07:59 2005
@@ -30,7 +30,7 @@
 	       const char *encoding)
 {
   if(encoding == NULL)
-    encoding=setlocale(LC_CTYPE, NULL);
+    encoding=nl_langinfo(CODESET);
 
   iconv_t converter=iconv_open("WCHAR_T", encoding);