w3m

commit 03498644030bb2cfe97b1bf8447b7c162cabce4e
parent 3d7304b174531b48c726e1974ff97f5f7271bc2d
Author: ukai <ukai>
Date:   Mon,  7 Aug 2006 03:10:26 +0000

mailcap.c (acceptableMimeTypes): change default accept: line
    w3m should prefer text/html to other text/*.
    reported as Debian Bug#374296

Diffstat:
M
ChangeLog
 | 
6
++++++
M
mailcap.c
 | 
9
++++-----

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git 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
diff --git a/mailcap.c b/mailcap.c
@@ -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, "/*");
     }