summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-01-01 05:33:04 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 10:24:02 +0100
commit3cdef72da397f3878dfb24a91281ddeaf0eece37 (patch)
tree50a97c4a2038126ee531ba601f23b8ce161aea69
parent1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 (diff)
downloadUXP-3cdef72da397f3878dfb24a91281ddeaf0eece37.tar
UXP-3cdef72da397f3878dfb24a91281ddeaf0eece37.tar.gz
UXP-3cdef72da397f3878dfb24a91281ddeaf0eece37.tar.lz
UXP-3cdef72da397f3878dfb24a91281ddeaf0eece37.tar.xz
UXP-3cdef72da397f3878dfb24a91281ddeaf0eece37.zip
Chase the fox out of the shell service.
"Welcome to branding hell, boys!" Part 2 for #271.
-rw-r--r--browser/components/shell/ShellService.jsm4
-rw-r--r--browser/components/shell/nsGNOMEShellService.cpp2
-rw-r--r--browser/components/shell/nsWindowsShellService.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm
index 2a3400b60..cc225eae0 100644
--- a/browser/components/shell/ShellService.jsm
+++ b/browser/components/shell/ShellService.jsm
@@ -62,10 +62,10 @@ let ShellServiceInternal = {
if (AppConstants.platform == "win") {
let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
- "Software\\Mozilla\\Firefox",
+ "Software\\Mozilla\\Basilisk",
"DefaultBrowserOptOut");
WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
- "Software\\Mozilla\\Firefox",
+ "Software\\Mozilla\\Basilisk",
"DefaultBrowserOptOut");
if (optOutValue == "True") {
Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false);
diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
index 1001a52ae..613b5bffc 100644
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -451,7 +451,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement,
// Set the image to an empty string first to force a refresh
// (since we could be writing a new image on top of an existing
- // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
+ // Basilisk_wallpaper.png and nautilus doesn't monitor the file for changes)
gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey),
EmptyCString());
diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index 6c43d95db..cb13c0910 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -135,7 +135,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// The following keys are set to make Basilisk appear in the Start Menu as the
// browser:
//
-// HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\
+// HKCU\SOFTWARE\Clients\StartMenuInternet\BASILISK.EXE\
// (default) REG_SZ <appname>
// DefaultIcon (default) REG_SZ <apppath>,0
// InstallInfo HideIconsCommand REG_SZ <uninstpath> /HideShortcuts