Fix windows bustage from bug 388388 landing by correcting base class name.

This commit is contained in:
dmose@mozilla.org 2007-07-24 14:30:01 -07:00
Родитель e3a82d4ecc
Коммит e854280f1f
2 изменённых файлов: 7 добавлений и 8 удалений

Просмотреть файл

@ -865,11 +865,11 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }
rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp); return aHandlerInfo->SetPreferredApplicationHandler(handlerApp);
} }
} else { } else {
// if we got here, there's no path name in the RDF graph, so this must // maybe we've get a uri template, which would indicate that this is a
// be a web app // web-handler
FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate, FillLiteralValueFromTarget(externalAppNodeResource, kNC_UriTemplate,
&stringValue); &stringValue);
if (stringValue && stringValue[0]) { if (stringValue && stringValue[0]) {
@ -879,14 +879,13 @@ nsresult nsExternalHelperAppService::FillContentHandlerProperties(
if (!handlerApp) { if (!handlerApp) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }
rv = aHandlerInfo->SetPreferredApplicationHandler(handlerApp); return 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 rv; return NS_OK;
} }
#endif /* MOZ_RDF */ #endif /* MOZ_RDF */

Просмотреть файл

@ -45,7 +45,7 @@ class nsMIMEInfoWin : public nsMIMEInfoBase, public nsIPropertyBag {
nsMIMEInfoWin(const char* aType = "") : nsMIMEInfoBase(aType) {} nsMIMEInfoWin(const char* aType = "") : nsMIMEInfoBase(aType) {}
nsMIMEInfoWin(const nsACString& aMIMEType) : nsMIMEInfoBase(aMIMEType) {} nsMIMEInfoWin(const nsACString& aMIMEType) : nsMIMEInfoBase(aMIMEType) {}
nsMIMEInfoWin(const nsACString& aType, HandlerClass aClass) : nsMIMEInfoWin(const nsACString& aType, HandlerClass aClass) :
nsMIMEInfoImpl(aType, aClass) {} nsMIMEInfoBase(aType, aClass) {}
virtual ~nsMIMEInfoWin(); virtual ~nsMIMEInfoWin();
NS_IMETHOD GetHasDefaultHandler(PRBool * _retval); NS_IMETHOD GetHasDefaultHandler(PRBool * _retval);