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

[Daniel Burrows]

Author: dburrows
Date: Sun Jun 26 17:44:07 2005
New Revision: 3470

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/columnify.cc
Log:
Use the new transcoder when constructing column_dispositions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jun 26 17:44:07 2005
@@ -1,5 +1,10 @@
 2005-06-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/columnify.cc:
+
+	  Use the new transcoder, so transcoding errors can be reported at
+	  a higher level.
+
 	* src/vscreen/transcode.cc, src/vscreen/transcode.h:
 
 	  Implement the new transcoder, and fix some types in the

Modified: branches/aptitude-0.3/aptitude/src/vscreen/columnify.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/columnify.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/columnify.cc	Sun Jun 26 17:44:07 2005
@@ -26,10 +26,8 @@
 column_disposition::column_disposition(const std::string &_text,
 				       int _minx,
 				       const char *encoding)
-  :minx(_minx)
+  :text(transcode(_text, encoding)), minx(_minx)
 {
-  if(!transcode(_text.c_str(), text, encoding))
-    text=L"TRANSCODING ERROR";
 }
 
 wstring columnify(const layout &format, int width)