Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When opening a .dmg file downloaded from site, user receives error message. p=shebs b=394342 r=dmose sr=roc

Browse Source
This commit is contained in:
joshmoz@gmail.com 2008-02-21 18:24:42 -08:00
parent 709741beff
commit 3b6a639adb
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uriloader/exthandler/mac/nsMIMEInfoMac.cpp
View File

@ -24,6 +24,7 @@
* Scott MacGregor <mscott@netscape.com>
* Christian Biesinger <cbiesinger@web.de>
* Dan Mosedale <dmose@mozilla.org>
* Stan Shebs <stanshebs@earthlink.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -115,12 +116,3 @@ nsMIMEInfoMac::LoadUriInternal(nsIURI *aURI)
}
return rv;
}
NS_IMETHODIMP
nsMIMEInfoMac::GetHasDefaultHandler(PRBool *_retval)
{
// We have a default application if we have a description
*_retval = !mDefaultAppDescription.IsEmpty();
return NS_OK;
}

2
uriloader/exthandler/mac/nsMIMEInfoMac.h
View File

@ -19,6 +19,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Stan Shebs <stanshebs@earthlink.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -47,7 +48,6 @@ class nsMIMEInfoMac : public nsMIMEInfoImpl {
nsMIMEInfoImpl(aType, aClass) {}
NS_IMETHOD LaunchWithFile(nsIFile* aFile);
NS_IMETHOD GetHasDefaultHandler(PRBool *_retval);
protected:
virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI);
#ifdef DEBUG

33
uriloader/exthandler/mac/nsOSHelperAppService.cpp
View File

@ -23,6 +23,7 @@
* Contributor(s):
* Scott MacGregor <mscott@netscape.com>
* Dan Mosedale <dmose@mozilla.org>
* Stan Shebs <stanshebs@earthlink.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -281,13 +282,37 @@ nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMEType,
if (!mimeInfo) {
*aFound = PR_FALSE;
PR_LOG(mLog, PR_LOG_DEBUG, ("Creating new mimeinfo\n"));
mimeInfo = new nsMIMEInfoMac(aMIMEType);
if (!mimeInfo)
// Create a Mac-specific MIME info so we can use Mac-specific members.
nsMIMEInfoMac* mimeInfoMac = new nsMIMEInfoMac(aMIMEType);
if (!mimeInfoMac)
return nsnull;
NS_ADDREF(mimeInfo);
NS_ADDREF(mimeInfoMac);
if (!aFileExt.IsEmpty())
mimeInfo->AppendExtension(aFileExt);
mimeInfoMac->AppendExtension(aFileExt);
// Now see if Launch Services knows of an application that should be run for this type.
OSStatus err;
FSRef appFSRef;
CFStringRef CFExt = ::CFStringCreateWithCString(NULL, flatExt.get(), kCFStringEncodingUTF8);
err = ::LSGetApplicationForInfo(kLSUnknownType, kLSUnknownCreator, CFExt,
kLSRolesAll, &appFSRef, nsnull);
if (err == noErr) {
nsCOMPtr<nsILocalFileMac> app(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
if (!app) {
::CFRelease(CFExt);
NS_RELEASE(mimeInfoMac);
return nsnull;
}
app->InitWithFSRef(&appFSRef);
mimeInfoMac->SetDefaultApplication(app);
PR_LOG(mLog, PR_LOG_DEBUG, ("LSGetApplicationForInfo found a default application\n"));
} else {
// Just leave the default application unset.
PR_LOG(mLog, PR_LOG_DEBUG, ("LSGetApplicationForInfo returned error code %d; default application was not set\n", err));
}
mimeInfo = mimeInfoMac;
::CFRelease(CFExt);
}
return mimeInfo;