зеркало из https://github.com/mozilla/gecko-dev.git
Backing out a file that was not part of the build fix.
This commit is contained in:
Родитель
e854280f1f
Коммит
889432af9f
|
@ -865,11 +865,11 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
||||||
return aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
|
rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// maybe we've get a uri template, which would indicate that this is a
|
// if we got here, there's no path name in the RDF graph, so this must
|
||||||
// web-handler
|
// be a web app
|
||||||
FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate,
|
FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate,
|
||||||
&stringValue);
|
&stringValue);
|
||||||
if (stringValue && stringValue[0]) {
|
if (stringValue && stringValue[0]) {
|
||||||
|
@ -879,13 +879,14 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
|
||||||
if (!handlerApp) {
|
if (!handlerApp) {
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
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 */
|
#endif /* MOZ_RDF */
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче