From a32bf68c85a97b3db9fe61e79c1120e21c5d5899 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Mon, 8 Apr 2013 21:48:49 +0900 Subject: Support the siteconf feature Patch to support the siteconf feature, from [w3m-dev 04463] on 2012-06-27, provided by AIDA Shinra. --- menu.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index 774b1bd..0f66583 100644 --- a/menu.c +++ b/menu.c @@ -1365,9 +1365,7 @@ initSelectMenu(void) break; default: Strcat_char(str, ' '); - p = parsedURL2Str(&buf->currentURL)->ptr; - if (DecodeURL) - p = url_unquote_conv(p, 0); + p = url_decode2(parsedURL2Str(&buf->currentURL)->ptr, NULL); Strcat_charp(str, p); break; } @@ -1513,9 +1511,7 @@ initSelTabMenu(void) case SCM_MISSING: break; default: - p = parsedURL2Str(&buf->currentURL)->ptr; - if (DecodeURL) - p = url_unquote_conv(p, 0); + p = url_decode2(parsedURL2Str(&buf->currentURL)->ptr, NULL); Strcat_charp(str, p); break; } @@ -1845,10 +1841,8 @@ link_menu(Buffer *buf) Strcat_charp(str, " "); if (!l->url) p = ""; - else if (DecodeURL) - p = url_unquote_conv(l->url, buf->document_charset); else - p = l->url; + p = url_decode2(l->url, buf); Strcat_charp(str, p); label[i] = str->ptr; if (len < str->length) -- cgit v1.2.3