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
This commit is contained in:
Chris Young 2008-11-16 23:29:40 +00:00
parent 17bc053fbf
commit d508def2d6
2 changed files with 10 additions and 2 deletions

View File

@ -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;
}

View File

@ -37,6 +37,7 @@
#include <proto/exec.h>
#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))