wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 17:47:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

[PALEMOON] Issue #283 - Pale Moon Shell Service is not invoking defalt client check on start

Browse source
This commit is contained in:
NTD 2018-04-30 02:50:07 -04:00 • committed by Roy Tam
commit ec4c3105bd
2 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
application/palemoon/app/profile/palemoon.js
View file

@ -236,6 +236,15 @@ pref("general.useragent.complexOverride.moodle", false); // bug 797703
// At startup, check if we're the default browser and prompt user if not. // At startup, check if we're the default browser and prompt user if not.
pref("browser.shell.checkDefaultBrowser", true); pref("browser.shell.checkDefaultBrowser", true);
pref("browser.shell.shortcutFavicons",true); pref("browser.shell.shortcutFavicons",true);
pref("browser.shell.mostRecentDateSetAsDefault", "");
#ifdef RELEASE_OR_BETA
pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", false);
#else
pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", true);
#endif
pref("browser.shell.skipDefaultBrowserCheck", true);
pref("browser.shell.defaultBrowserCheckCount", 0);
pref("browser.defaultbrowser.notificationbar", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore

47
application/palemoon/components/nsBrowserGlue.js
View file

@ -37,6 +37,7 @@ Cu.import("resource://gre/modules/Services.jsm");
["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"], ["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"],
["AutoCompletePopup", "resource:///modules/AutoCompletePopup.jsm"], ["AutoCompletePopup", "resource:///modules/AutoCompletePopup.jsm"],
["DateTimePickerHelper", "resource://gre/modules/DateTimePickerHelper.jsm"], ["DateTimePickerHelper", "resource://gre/modules/DateTimePickerHelper.jsm"],
["ShellService", "resource:///modules/ShellService.jsm"],
].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource)); ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", XPCOMUtils.defineLazyServiceGetter(this, "AlertsService",
@ -562,17 +563,17 @@ BrowserGlue.prototype = {
} }
// Perform default browser checking. // Perform default browser checking.
var shell; if (ShellService) {
try { let shouldCheck = ShellService.shouldCheckDefaultBrowser;
shell = Components.classes["@mozilla.org/browser/shell-service;1"]
.getService(Components.interfaces.nsIShellService); const skipDefaultBrowserCheck =
} catch (e) { } Services.prefs.getBoolPref("browser.shell.skipDefaultBrowserCheckOnFirstRun") &&
if (shell) { Services.prefs.getBoolPref("browser.shell.skipDefaultBrowserCheck");
#ifdef DEBUG
let shouldCheck = false; const usePromptLimit = false;
#else let promptCount =
let shouldCheck = shell.shouldCheckDefaultBrowser; usePromptLimit ? Services.prefs.getIntPref("browser.shell.defaultBrowserCheckCount") : 0;
#endif
let willRecoverSession = false; let willRecoverSession = false;
try { try {
let ss = Cc["@mozilla.org/browser/sessionstartup;1"]. let ss = Cc["@mozilla.org/browser/sessionstartup;1"].
@ -582,9 +583,25 @@ BrowserGlue.prototype = {
} }
catch (ex) { /* never mind; suppose SessionStore is broken */ } catch (ex) { /* never mind; suppose SessionStore is broken */ }
let isDefault = shell.isDefaultBrowser(true, false); // startup check, check all assoc // startup check, check all assoc
let isDefault = false;
let isDefaultError = false;
try {
isDefault = ShellService.isDefaultBrowser(true, false);
} catch (ex) {
isDefaultError = true;
}
if (shouldCheck && !isDefault && !willRecoverSession) { if (isDefault) {
let now = (Math.floor(Date.now() / 1000)).toString();
Services.prefs.setCharPref("browser.shell.mostRecentDateSetAsDefault", now);
}
let willPrompt = shouldCheck && !isDefault && !willRecoverSession;
// Skip the "Set Default Browser" check during first-run or after the
// browser has been run a few times.
if (willPrompt) {
Services.tm.mainThread.dispatch(function() { Services.tm.mainThread.dispatch(function() {
var win = this.getMostRecentBrowserWindow(); var win = this.getMostRecentBrowserWindow();
var brandBundle = win.document.getElementById("bundle_brand"); var brandBundle = win.document.getElementById("bundle_brand");
@ -613,9 +630,9 @@ BrowserGlue.prototype = {
claimAllTypes = (parseFloat(version) < 6.2); claimAllTypes = (parseFloat(version) < 6.2);
} catch (ex) { } } catch (ex) { }
#endif #endif
shell.setDefaultBrowser(claimAllTypes, false); ShellService.setDefaultBrowser(claimAllTypes, false);
} }
shell.shouldCheckDefaultBrowser = checkEveryTime.value; ShellService.shouldCheckDefaultBrowser = checkEveryTime.value;
}.bind(this), Ci.nsIThread.DISPATCH_NORMAL); }.bind(this), Ci.nsIThread.DISPATCH_NORMAL);
} }
} }