mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixing bug 108530 - Setup.exe error on install, mozilla launches with full screen empty page. r=curt sr=dveditz

This commit is contained in:
ssu%netscape.com 2001-11-17 06:21:11 +00:00
Родитель d96aa71f6a
Коммит a0e9d2a1f6
3 изменённых файлов: 15 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
xpinstall/packager/windows/browser.jst
Просмотреть файл

@ -122,13 +122,13 @@ function createShortcuts()
// locate the Quick Launch folder
szFolderQuickLaunch = szFolderAppData + "\\Microsoft\\Internet Explorer\\Quick Launch";
fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
folderQuickLaunchExists = File.exists(fFolderQuickLaunch);
folderQuickLaunchExists = File.isDirectory(fFolderQuickLaunch);
if(!folderQuickLaunchExists)
{
subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
valname = "Quick Launch";
szFolderQuickLaunch = winreg.getValueString(subkey, valname);
folderQuickLaunchExists = File.exists(fFolderPath);
folderQuickLaunchExists = File.isDirectory(fFolderPath);
if(folderQuickLaunchExists)
fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
}

4
xpinstall/packager/windows/mail.jst
Просмотреть файл

@ -135,13 +135,13 @@ function createShortcuts()
// locate the Quick Launch folder
szFolderQuickLaunch = szFolderAppData + "\\Microsoft\\Internet Explorer\\Quick Launch";
fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
folderQuickLaunchExists = File.exists(fFolderQuickLaunch);
folderQuickLaunchExists = File.isDirectory(fFolderQuickLaunch);
if(!folderQuickLaunchExists)
{
subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
valname = "Quick Launch";
szFolderQuickLaunch = winreg.getValueString(subkey, valname);
folderQuickLaunchExists = File.exists(fFolderPath);
folderQuickLaunchExists = File.isDirectory(fFolderPath);
if(folderQuickLaunchExists)
fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
}

19
xpinstall/src/nsInstallFileOpItem.cpp
Просмотреть файл

@ -1314,7 +1314,7 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutComplete()
if(mIcon)
mIcon->GetPath(&iconNativePathStr);
ret = CreateALink(targetNativePathStr,
CreateALink(targetNativePathStr,
shortcutNativePathStr,
cDescription,
workingpathNativePathStr,
@ -1322,8 +1322,7 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutComplete()
iconNativePathStr,
mIconId);
if(nsInstall::SUCCESS == ret)
mAction = nsInstallFileOpItem::ACTION_SUCCESS;
mAction = nsInstallFileOpItem::ACTION_SUCCESS;
}
if(cDescription)
@ -1342,12 +1341,16 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutAbort()
nsString shortcutDescription;
nsCOMPtr<nsIFile> shortcutTarget;
shortcutDescription = *mDescription;
shortcutDescription.AppendWithConversion(".lnk");
mShortcutPath->Clone(getter_AddRefs(shortcutTarget));
shortcutTarget->Append(NS_LossyConvertUCS2toASCII(shortcutDescription).get());
if(mShortcutPath && mDescription)
{
shortcutDescription = *mDescription;
shortcutDescription.AppendWithConversion(".lnk");
mShortcutPath->Clone(getter_AddRefs(shortcutTarget));
shortcutTarget->Append(NS_LossyConvertUCS2toASCII(shortcutDescription).get());
NativeFileOpFileDeleteComplete(shortcutTarget);
}
NativeFileOpFileDeleteComplete(shortcutTarget);
#endif
return nsInstall::SUCCESS;