diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 12:21:38 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 12:21:38 +0100 |
| commit | 51b6354f31b5f2122c11afec7fc0e3d650ce5e5d (patch) | |
| tree | cfc8e519c89e459f7199a8210c72879537dec208 /browser/components/shell | |
| parent | d38f865699b1c1cb2395f719324b661acffa3223 (diff) | |
| parent | 31c5e63eda295ed87419ff035631cadf776244af (diff) | |
| download | UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.gz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.lz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.xz UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.zip | |
Merge branch 'ported-moebius'
Diffstat (limited to 'browser/components/shell')
| -rw-r--r-- | browser/components/shell/ShellService.jsm | 4 | ||||
| -rw-r--r-- | browser/components/shell/nsGNOMEShellService.cpp | 2 | ||||
| -rw-r--r-- | browser/components/shell/nsWindowsShellService.cpp | 2 |
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 |