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

[Daniel Burrows]

Author: dburrows
Date: Wed Jul  6 14:57:30 2005
New Revision: 3624

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
Log:
Fix the 'show' command for wide characters.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Jul  6 14:57:30 2005
@@ -1,3 +1,9 @@
+2005-07-06  Daniel Burrows  <dburrows@debian.org>
+
+	* src/cmdline/cmdline_show.cc:
+
+	  Fix output of wide characters. (Closes: #317115)
+
 2005-07-05 Rubén Porras <nahoo@inicia.es>
 
 	* Convert to UTF8 the following files:
@@ -50,7 +56,7 @@
 
 	* src/cmdline/cmdline_search.cc:
 
-	  Fix "search" output.
+	  Fix "search" output. (Retroactively Closes: #317115)
 
 2005-07-05 Rubén Porras <nahoo@inicia>
 	

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	Wed Jul  6 14:57:30 2005
@@ -32,12 +32,12 @@
   for(fragment_contents::const_iterator i=contents.begin();
       i!=contents.end(); ++i)
     {
-      string s;
+      wstring s;
       // Drop the attributes.
       for(fragment_line::const_iterator j=i->begin(); j!=i->end(); ++j)
 	s.push_back((*j).ch);
 
-      out << s << endl;
+      out << transcode(s) << endl;
     }
 
   return out;