Bug #227863 -> THUNDERBIRD only change. Does not effect seamonkey.

Use a more compact out going user agent string instead of a browser http styled user-agent on outgoing messages.
This commit is contained in:
scott%scott-macgregor.org 2003-12-19 16:01:06 +00:00
parent b158b64aa3
commit 2e7f25c413

View File

@ -467,16 +467,41 @@ RRT_HEADER:
}
nsCOMPtr<nsIHttpProtocolHandler> pHTTPHandler =
do_GetService(kHTTPHandlerCID, &rv);
nsCOMPtr<nsIHttpProtocolHandler> pHTTPHandler = do_GetService(kHTTPHandlerCID, &rv);
if (NS_SUCCEEDED(rv) && pHTTPHandler)
{
nsCAutoString userAgentString;
#ifdef MOZ_THUNDERBIRD
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIStringBundle> brandSringBundle;
rv = stringService->CreateBundle("chrome://global/locale/brand.properties", getter_AddRefs(brandSringBundle));
if (NS_SUCCEEDED(rv))
{
nsXPIDLString brandName;
rv = brandSringBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), getter_Copies(brandName));
nsCAutoString vendorSub;
pHTTPHandler->GetVendorSub(vendorSub);
nsCAutoString productSub;
pHTTPHandler->GetProductSub(productSub);
userAgentString.AssignWithConversion(brandName.get());
userAgentString += ' ';
userAgentString += vendorSub;
userAgentString += " (";
userAgentString += productSub;
userAgentString += ")";
}
}
#else
pHTTPHandler->GetUserAgent(userAgentString);
#endif
if (!userAgentString.IsEmpty())
{
// PUSH_STRING ("X-Mailer: "); // To be more standards compliant
PUSH_STRING ("User-Agent: ");
PUSH_STRING(userAgentString.get());
PUSH_NEWLINE ();