From 889432af9f8bd51ef98f5b48e7161be8b0d6c003 Mon Sep 17 00:00:00 2001 From: "dmose@mozilla.org" Date: Tue, 24 Jul 2007 14:31:24 -0700 Subject: [PATCH] Backing out a file that was not part of the build fix. --- uriloader/exthandler/nsExternalHelperAppService.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index d1bd09d92282..199494b8077a 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -865,11 +865,11 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties( return NS_ERROR_OUT_OF_MEMORY; } - return aHandlerInfo->SetPreferredApplicationHandler(handlerApp); + rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp); } } else { - // maybe we've get a uri template, which would indicate that this is a - // web-handler + // if we got here, there's no path name in the RDF graph, so this must + // be a web app FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate, &stringValue); if (stringValue && stringValue[0]) { @@ -879,13 +879,14 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties( if (!handlerApp) { return NS_ERROR_OUT_OF_MEMORY; } - return aHandlerInfo->SetPreferredApplicationHandler(handlerApp); + rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp); + } else { + return NS_ERROR_FAILURE; // no path name _and_ no uri template } - // otherwise, no handler at all; fall through to return NS_OK } } - return NS_OK; + return rv; } #endif /* MOZ_RDF */