From d508def2d677ab41e32dde4b7b214852f10f08a4 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 16 Nov 2008 23:29:40 +0000 Subject: HTML files with an icon but no MIMETYPE tooltype were being picked up by the simplehtml datatype. As I'm using dth_BaseName rather than dth_Name, they were being tagged with the MIME type text/simplehtml. Have made an exception for this case to translate it to text/html, may in the future consider whether using dth_Name may be better. Minor adjustments to the local file requester to prevent .info files from being displayed. svn path=/trunk/netsurf/; revision=5711 --- amiga/filetype.c | 6 ++++++ amiga/menu.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'amiga') diff --git a/amiga/filetype.c b/amiga/filetype.c index eec0fdd35..bc742c579 100644 --- a/amiga/filetype.c +++ b/amiga/filetype.c @@ -79,6 +79,10 @@ const char *fetch_filetype(const char *unix_path) { sprintf(mimetype,"text/plain",dth->dth_BaseName); } + else if(strcmp("simplehtml",dth->dth_BaseName)==0) + { + sprintf(mimetype,"text/html",dth->dth_BaseName); + } else { sprintf(mimetype,"text/%s",dth->dth_BaseName); @@ -106,6 +110,8 @@ const char *fetch_filetype(const char *unix_path) if(!found) strcpy(mimetype,"text/html"); /* If all else fails */ + //printf("%s: %s\n",unix_path,mimetype); + return mimetype; } diff --git a/amiga/menu.c b/amiga/menu.c index 7cff6b4d4..ec79537fc 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -37,6 +37,7 @@ #include #include "amiga/arexx.h" #include "amiga/save_complete.h" +#include "utils/url.h" BOOL menualreadyinit; const char * const netsurf_version; @@ -396,8 +397,9 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, ASLFR_DoSaveMode,FALSE, -// ASLFR_InitialDrawer,option_arexx_dir, -// ASLFR_InitialPattern,"#?.html", + ASLFR_RejectIcons,TRUE, + ASLFR_DoPatterns,TRUE, +// ASLFR_InitialPattern,"~(#?.info)", TAG_DONE)) { if(temp = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR)) -- cgit v1.2.3