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

[Daniel Burrows]

Author: dburrows
Date: Sun Jul  3 18:19:49 2005
New Revision: 3592

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Also allow the encoding of README to be specified.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jul  3 18:19:49 2005
@@ -1,5 +1,9 @@
 2005-07-03  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.cc:
+
+	  Also allow the encoding of README to be specified.
+
 	* po/Makefile.in.in:
 
 	  Rebuild po/Makefile if po/Makevars changes.

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Sun Jul  3 18:19:49 2005
@@ -698,11 +698,17 @@
 
   snprintf(buf, 512, HELPDIR "/%s", _("README")); // README can be translated..
 
+  const char *encoding=P_("Encoding of README|UTF-8");
+
   // Deal with missing localized docs.
   if(access(buf, R_OK)!=0)
-    strncpy(buf, HELPDIR "/README", 512);
+    {
+      strncpy(buf, HELPDIR "/README", 512);
+      encoding="UTF-8";
+    }
 
-  vscreen_widget *w=vs_dialog_fileview(buf, NULL, arg(sigc::ptr_fun(pager_search)));
+  vscreen_widget *w=vs_dialog_fileview(buf, NULL, arg(sigc::ptr_fun(pager_search)),
+				       encoding);
   w->show_all();
   popup_widget(w);
 }