mailcap.c (acceptableMimeTypes): change default accept: line

    w3m should prefer text/html to other text/*.
    reported as Debian Bug#374296

2 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index b9b626e..37f252d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-07  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* mailcap.c (acceptableMimeTypes): change default accept: line
+	    w3m should prefer text/html to other text/*.
+	    reported as Debian Bug#374296
+
 2006-06-12  Dai Sato  <satodai@w3m.jp>
 
 	* another fix for [w3m-dev-en 01067] Some more patches
@@ -8748,4 +8754,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.968 2006/06/12 11:51:59 inu Exp $
+$Id: ChangeLog,v 1.969 2006/08/07 03:10:26 ukai Exp $
diff --git a/mailcap.c b/mailcap.c
index e26da72..c0461df 100644
--- a/mailcap.c
+++ b/mailcap.c
@@ -1,4 +1,4 @@
-/* $Id: mailcap.c,v 1.12 2003/01/17 17:06:04 ukai Exp $ */
+/* $Id: mailcap.c,v 1.13 2006/08/07 03:10:26 ukai Exp $ */
 #include "fm.h"
 #include "myctype.h"
 #include <stdio.h>
@@ -252,7 +252,7 @@ acceptableMimeTypes()
     /* generate acceptable media types */
     l = newTextList();
     mhash = newHash_si(16);	/* XXX */
-    pushText(l, "text");
+    /* pushText(l, "text"); */
     putHash_si(mhash, "text", 1);
     pushText(l, "image");
     putHash_si(mhash, "image", 1);
@@ -272,11 +272,10 @@ acceptableMimeTypes()
 	    }
 	}
     }
+    types = Strnew();
+    Strcat_charp(types, "text/html, text/*;q=0.5");
     while ((p = popText(l)) != NULL) {
-	if (types == NULL)
-	    types = Strnew();
-	else
-	    Strcat_charp(types, ", ");
+	Strcat_charp(types, ", ");
 	Strcat_charp(types, p);
 	Strcat_charp(types, "/*");
     }