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

147679 GetFromMIMEType on Windows only gets one extension and needs rethinking r=bzbarsky sr=darin

Browse Source 
this merges nsIMIMEService::GetFromType and GetFromExtension


git-svn-id: svn://10.0.0.236/trunk@145198 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2003-07-25 16:48:00 +00:00
parent 6fa5a7f31e
commit 72ffd605aa
27 changed files with 894 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp
View File

@@ -330,16 +330,11 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports
// if we were given an explicit content type, use it....
nsCOMPtr<nsIMIMEInfo> mimeInfo;
if (mimeService)
if (mimeService && (!contentType.IsEmpty() || !fileExtension.IsEmpty()))
{
if (!contentType.IsEmpty())
{
mimeService->GetFromMIMEType(contentType.get(), getter_AddRefs(mimeInfo));
}
if (!mimeInfo) // try to grab an extension for the dummy file in the url.
{
mimeService->GetFromExtension(fileExtension.get(), getter_AddRefs(mimeInfo));
}
mimeService->GetFromTypeAndExtension(contentType.get(),
fileExtension.get(),
getter_AddRefs(mimeInfo));
}
// if we don't have enough info to fetch an application icon, bail

2
mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
View File

@@ -409,7 +409,7 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports
nsCOMPtr<nsIMIMEInfo> mimeObject;
NS_ENSURE_SUCCESS(rv, rv);
mimeService->GetFromMIMEType(contentType.get(), getter_AddRefs(mimeObject));
mimeService->GetFromTypeAndExtension(contentType.get(), nsnull, getter_AddRefs(mimeObject));
if (mimeObject)
{
nsXPIDLCString fileExt;

2
mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
View File

@@ -331,7 +331,7 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports
nsCOMPtr<nsIMIMEInfo> mimeObject;
NS_ENSURE_SUCCESS(rv, rv);
mimeService->GetFromMIMEType(contentType.get(), getter_AddRefs(mimeObject));
mimeService->GetFromTypeAndExtension(contentType.get(), nsnull, getter_AddRefs(mimeObject));
if (mimeObject)
{
nsXPIDLCString fileExt;