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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 18:05:52 2005
New Revision: 3559

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
Log:
Pass a wstring to desc_parse.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 18:05:52 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_show.cc:
+
+	  Fix the 'show' command to pass a wstring to desc_parse.
+
 	* src/desc_parse.cc, src/desc_parse.h:
 
 	  Update the description parser to take a wide string as input.

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	Sat Jul  2 18:05:52 2005
@@ -13,6 +13,7 @@
 #include <generic/matchers.h>
 
 #include <vscreen/fragment.h>
+#include <vscreen/transcode.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
@@ -326,7 +327,7 @@
 
   fragments.push_back(fragf("%s%s%n",
 			    _("Description: "), rec.ShortDesc().c_str()));
-  fragments.push_back(indentbox(1, 1, make_desc_fragment(rec.LongDesc())));
+  fragments.push_back(indentbox(1, 1, make_desc_fragment(transcode(rec.LongDesc()))));
 
   return sequence_fragment(fragments);
 }