Bug 385065 - protocol handling dialog. r=cbiesinger (forgot to fix two nits)
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1201,17 +1201,17 @@ static const char kExternalWarningDefaul
NS_IMETHODIMP
nsExternalHelperAppService::LoadURI(nsIURI *aURI,
nsIInterfaceRequestor *aWindowContext)
{
NS_ENSURE_ARG_POINTER(aURI);
nsCAutoString scheme;
- (void)aURI->GetScheme(scheme);
+ aURI->GetScheme(scheme);
if (scheme.IsEmpty())
return NS_OK; // must have a scheme
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (!prefs)
return NS_OK; // deny if we can't check prefs
// Deny load if the prefs say to do so
--- a/uriloader/exthandler/nsExternalProtocolHandler.cpp
+++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp
@@ -183,17 +183,17 @@ nsresult nsExtProtocolChannel::OpenURL()
#ifdef DEBUG
nsCAutoString urlScheme;
mUrl->GetScheme(urlScheme);
PRBool haveHandler = PR_FALSE;
extProtService->ExternalProtocolHandlerExists(urlScheme.get(), &haveHandler);
NS_ASSERTION(haveHandler, "Why do we have a channel for this url if we don't support the protocol?");
#endif
- rv = extProtService->LoadURI(mUrl, nsnull);
+ rv = extProtService->LoadURI(mUrl, mCallbacks);
}
// Drop notification callbacks to prevent cycles.
mCallbacks = 0;
return rv;
}