Bug 828284 - Force shortcut desktop icons off on Windows XP. r=bbondy

This commit is contained in:
Adri Hilviu 2013-05-29 11:00:18 -04:00
parent afdd23dc14
commit 5c03cd9283
2 changed files with 4 additions and 1 deletions

View File

@ -227,6 +227,7 @@ pref("general.useragent.complexOverride.moodle", false); // bug 797703
// At startup, check if we're the default browser and prompt user if not.
pref("browser.shell.checkDefaultBrowser", true);
pref("browser.shell.shortcutFavicons",true);
// 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

View File

@ -37,6 +37,7 @@
using namespace mozilla;
using namespace mozilla::widget;
#define DEFAULT_THREAD_TIMEOUT_MS 30000
@ -1114,7 +1115,8 @@ nsDataObj :: GetFileContentsInternetShortcut ( FORMATETC& aFE, STGMEDIUM& aSTG )
const char *shortcutFormatStr;
int totalLen;
nsCString path;
if (!Preferences::GetBool(kShellIconPref, true)) {
if (!Preferences::GetBool(kShellIconPref, true) ||
WinUtils::GetWindowsVersion() < WinUtils::VISTA_VERSION) {
shortcutFormatStr = "[InternetShortcut]\r\nURL=%s\r\n";
const int formatLen = strlen(shortcutFormatStr) - 2; // don't include %s
totalLen = formatLen + asciiUrl.Length(); // don't include null character