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

[Daniel Burrows]

Author: dburrows
Date: Sun Jul  3 18:22:03 2005
New Revision: 3593

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/mine/cmine.cc
Log:
Similar transformation for cmine.cc.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jul  3 18:22:03 2005
@@ -1,5 +1,10 @@
 2005-07-03  Daniel Burrows  <dburrows@debian.org>
 
+	* src/mine/cmine.cc:
+
+	  Allow the encoding of mine-help.txt to be specified, and
+	  be robust against it missing.
+
 	* src/ui.cc:
 
 	  Also allow the encoding of README to be specified.

Modified: branches/aptitude-0.3/aptitude/src/mine/cmine.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/mine/cmine.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/mine/cmine.cc	Sun Jul  3 18:22:03 2005
@@ -623,7 +623,15 @@
 
       snprintf(buf, 512, HELPDIR "/%s", _("mine-help.txt"));
 
-      vscreen_widget *w=vs_dialog_fileview(buf);
+      const char *encoding=P_("Encoding of mine-help.txt|UTF-8");
+
+      if(access(buf, R_OK)!=0)
+	{
+	  strncpy(buf, HELPDIR "/mine-help.txt", 512);
+	  encoding="UTF-8";
+	}
+
+      vscreen_widget *w=vs_dialog_fileview(buf, NULL, NULL, encoding);
       w->show_all();
 
       popup_widget(w);