diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-04-08 12:48:49 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-04-08 12:48:49 +0000 |
| commit | a32bf68c85a97b3db9fe61e79c1120e21c5d5899 (patch) | |
| tree | 3afa477065483bccae8fd7f333f9b2d565b64696 /menu.c | |
| parent | Merge from upstream on 2012-05-22 (diff) | |
| download | w3m-a32bf68c85a97b3db9fe61e79c1120e21c5d5899.tar.gz w3m-a32bf68c85a97b3db9fe61e79c1120e21c5d5899.zip | |
Support the siteconf feature
Patch to support the siteconf feature, from [w3m-dev 04463]
on 2012-06-27, provided by AIDA Shinra.
Diffstat (limited to '')
| -rw-r--r-- | menu.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -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) |