Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkin fix for bug 115128 for sfraser (assertion removed) (r=brade, sr=darin)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@119538 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brade%netscape.com 2002-04-22 13:39:16 +00:00
parent 8ebe39086f
commit 82ede514b3
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -1853,21 +1853,22 @@ NS_IMETHODIMP nsExternalHelperAppService::GetTypeFromURI(nsIURI *aURI, char **aC
#ifdef XP_MAC
if (NS_SUCCEEDED(rv))
{
nsCAutoString fileExt;
url->GetFileExtension(fileExt);
nsresult rv2;
nsCOMPtr<nsIFileURL> fileurl = do_QueryInterface( url, &rv2 );
if ( NS_SUCCEEDED ( rv2 ) )
{
nsCOMPtr <nsIFile> file;
rv2 = fileurl->GetFile( getter_AddRefs( file ) );
if ( NS_SUCCEEDED( rv2 ) )
{
rv2 = GetTypeFromFile( file, aContentType );
if( NS_SUCCEEDED ( rv2 ) )
return rv2;
}
PRBool isFileScheme = PR_FALSE;
if (NS_SUCCEEDED(fileurl->SchemeIs("file", &isFileScheme)) && isFileScheme)
{
nsCOMPtr <nsIFile> file;
rv2 = fileurl->GetFile(getter_AddRefs(file));
if (NS_SUCCEEDED(rv2))
{
rv2 = GetTypeFromFile(file, aContentType);
if (NS_SUCCEEDED(rv2))
return rv2;
}
}
}
}
#endif