[Aptitude-svn-commit] r3452 - in branches/aptitude-0.3/aptitude: . src
Daniel Burrows
dburrows@costa.debian.org
Sun, 26 Jun 2005 11:08:11 +0000
Author: dburrows
Date: Sun Jun 26 11:08:09 2005
New Revision: 3452
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/pkg_view.cc
Log:
Transcode new column formats applied to a label.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sun Jun 26 11:08:09 2005
@@ -1,5 +1,10 @@
2005-06-26 Daniel Burrows <dburrows@debian.org>
+ * src/pkg_view.cc:
+
+ When altering the column format of a view, transcode the input
+ column template.
+
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Add an overloading of set_text that accepts wstrings.
Modified: branches/aptitude-0.3/aptitude/src/pkg_view.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_view.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_view.cc Sun Jun 26 11:08:09 2005
@@ -124,13 +124,19 @@
pkg_handling_label *l)
{
string format=aptcfg->Find(key, the_default.c_str());
+ wstring wformat;
- column_definition_list *columns=parse_columns(format,
- pkg_item::pkg_columnizer::parse_column_type,
- pkg_item::pkg_columnizer::defaults);
+ column_definition_list *columns=NULL;
+
+ if(!transcode(format.c_str(), wformat))
+ _error->Errno("iconv", _("Couldn't transcode column definition"));
+ else
+ columns=parse_columns(format,
+ pkg_item::pkg_columnizer::parse_column_type,
+ pkg_item::pkg_columnizer::defaults);
if(!columns)
- _error->Error("Couldn't parse column definition");
+ _error->Error(_("Couldn't parse column definition"));
else
l->set_columns(columns);
}