Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 23:12:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

84344 - defer skin switch to restart.

Browse Source 
r=danm, sr=hyatt, a=chofmann.
btw, the last few changes were for bug 65251.
This commit is contained in:
ben%netscape.com 2006-09-14 05:58:31 +00:00
parent 22aef24a0a
commit f201e5a4ce
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
suite/browser/navigator.js
View File

@ -1253,16 +1253,16 @@ function applyTheme(themeName)
var chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
.getService(Components.interfaces.nsIChromeRegistry);
var oldTheme = false;
try {
oldTheme = !chromeRegistry.checkThemeVersion(themeName.getAttribute("name"));
}
catch(e) {
oldTheme = false;
}
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
if (oldTheme) {
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
var title = gNavigatorBundle.getString("oldthemetitle");
var message = gNavigatorBundle.getString("oldTheme");
@ -1270,11 +1270,12 @@ function applyTheme(themeName)
message = message.replace(/%brand%/g, gBrandBundle.getString("brandShortName"));
if (promptService.confirm(window, title, message)){
var inUse = chromeRegistry.isSkinSelected(themeName.getAttribute("name"), true);
chromeRegistry.uninstallSkin( themeName.getAttribute("name"), true );
// XXX - this sucks and should only be temporary.
pref.SetUnicharPref("general.skins.removelist." + themeName.getAttribute("name"), true);
if (inUse)
chromeRegistry.refreshSkins();
}
@ -1282,8 +1283,18 @@ function applyTheme(themeName)
return;
}
chromeRegistry.selectSkin(themeName.getAttribute("name"), true);
chromeRegistry.refreshSkins();
// XXX XXX BAD BAD BAD BAD !! XXX XXX
// we STILL haven't fixed editor skin switch problems
// hacking around it yet again
pref.SetUnicharPref("general.skins.selectedSkin", themeName.getAttribute("name"));
if (promptService) {
var dialogTitle = gNavigatorBundle.getString("switchskinstitle");
var brandName = gBrandBundle.getString("brandShortName");
var msg = gNavigatorBundle.getFormattedString("switchskins", [brandName]);
promptService.alert(window, dialogTitle, msg);
}
}