From b43477b7a348aac246dd632fb79cd39ec57819c6 Mon Sep 17 00:00:00 2001 From: "valeski%netscape.com" Date: Tue, 8 Feb 2000 05:56:30 +0000 Subject: [PATCH] r=dougt. 10465. the User Agent language portion now comes from a pref because the iLocaleService is the OS setting and we want app level l10n settings in teh UA string git-svn-id: svn://10.0.0.236/trunk@60077 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 13 ------------- mozilla/webshell/src/nsWebShell.cpp | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index ccf5f2ffc57..3c5f7cf898a 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1056,19 +1056,6 @@ nsWebShell::Init(nsNativeWidget aNativeParent, widgetInit.mWindowType = eWindowType_child; } - // Set the language portion of the user agent. :) - NS_WITH_SERVICE(nsILocaleService, localeServ, kLocaleServiceCID, &rv); - if (NS_FAILED(rv)) return rv; - - PRUnichar *UALang; - rv = localeServ->GetLocaleComponentForUserAgent(&UALang); - if (NS_FAILED(rv)) return rv; - - NS_WITH_SERVICE(nsIIOService, ioServ, kIOServiceCID, &rv); - if (NS_FAILED(rv)) return rv; - - rv = ioServ->SetLanguage(UALang); - nsAllocator::Free(UALang); return rv; } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index ccf5f2ffc57..3c5f7cf898a 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -1056,19 +1056,6 @@ nsWebShell::Init(nsNativeWidget aNativeParent, widgetInit.mWindowType = eWindowType_child; } - // Set the language portion of the user agent. :) - NS_WITH_SERVICE(nsILocaleService, localeServ, kLocaleServiceCID, &rv); - if (NS_FAILED(rv)) return rv; - - PRUnichar *UALang; - rv = localeServ->GetLocaleComponentForUserAgent(&UALang); - if (NS_FAILED(rv)) return rv; - - NS_WITH_SERVICE(nsIIOService, ioServ, kIOServiceCID, &rv); - if (NS_FAILED(rv)) return rv; - - rv = ioServ->SetLanguage(UALang); - nsAllocator::Free(UALang); return rv; }