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

2
mozilla/embedding/browser/activex/src/control/PropertyDlg.cpp
View File

@@ -110,7 +110,7 @@ LRESULT CPPageDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
nsCOMPtr<nsIMIMEInfo> mimeInfo;
nsCAutoString contentType;
contentType.AssignWithConversion(mType);
mimeService->GetFromMIMEType(contentType.get(), getter_AddRefs(mimeInfo));
mimeService->GetFromTypeAndExtension(contentType.get(), nsnull, getter_AddRefs(mimeInfo));
if (mimeInfo)
{
nsXPIDLString description;

2
mozilla/embedding/browser/cocoa/src/SaveHeaderSniffer.mm
View File

@@ -253,7 +253,7 @@ nsresult nsHeaderSniffer::PerformSave(nsIURI* inOriginalURI)
if (!mimeService)
return rv;
nsCOMPtr<nsIMIMEInfo> mimeInfo;
rv = mimeService->GetFromMIMEType(mContentType.get(), getter_AddRefs(mimeInfo));
rv = mimeService->GetFromTypeAndExtension(mContentType.get(), nsnull, getter_AddRefs(mimeInfo));
if (!mimeInfo)
return rv;

2
mozilla/embedding/browser/powerplant/source/CHeaderSniffer.cpp
View File

@@ -281,7 +281,7 @@ nsresult CHeaderSniffer::PerformSave(nsIURI* inOriginalURI, const ESaveFormat in
if (!mimeService)
return rv;
nsCOMPtr<nsIMIMEInfo> mimeInfo;
rv = mimeService->GetFromMIMEType(mContentType.get(), getter_AddRefs(mimeInfo));
rv = mimeService->GetFromTypeAndExtension(mContentType.get(), nsnull, getter_AddRefs(mimeInfo));
if (!mimeInfo)
return rv;

6
mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
View File

@@ -1285,7 +1285,7 @@ nsWebBrowserPersist::GetExtensionForContentType(const PRUnichar *aContentType, P
nsCOMPtr<nsIMIMEInfo> mimeInfo;
nsCAutoString contentType;
contentType.AssignWithConversion(aContentType);
mMIMEService->GetFromMIMEType(contentType.get(), getter_AddRefs(mimeInfo));
mMIMEService->GetFromTypeAndExtension(contentType.get(), nsnull, getter_AddRefs(mimeInfo));
if (mimeInfo)
{
nsXPIDLCString ext;
@@ -2058,8 +2058,8 @@ nsWebBrowserPersist::CalculateAndAppendFileExt(nsIURI *aURI, nsIChannel *aChanne
if (!contentType.IsEmpty())
{
nsCOMPtr<nsIMIMEInfo> mimeInfo;
mMIMEService->GetFromMIMEType(
contentType.get(), getter_AddRefs(mimeInfo));
mMIMEService->GetFromTypeAndExtension(
contentType.get(), nsnull, getter_AddRefs(mimeInfo));
nsCOMPtr<nsILocalFile> localFile;
GetLocalFileFromURI(aURI, getter_AddRefs(localFile));