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

Fix for bug 136763: Components are at incorrect location in "Select 

Typical/Additional Components" screen (r=smeredith)
This commit is contained in:
shrutiv%netscape.com 2002-08-10 00:50:03 +00:00
Родитель 6d0f3eb806
Коммит 7b473a5697
1 изменённых файлов: 22 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
cck/ib/ib.cpp
Просмотреть файл

@ -1453,6 +1453,8 @@ void ModifySidebar(CString inputFile, CString outputFile)
srcf.getline(tempbuf,MAX_SIZE);
dstf << tempbuf << "\n";
if ((CString(tempbuf).Find(searchstr)) != -1)
{
if (!(sidebartabTitle.IsEmpty()) && !(sidebartabURL.IsEmpty()))
{
dstf << " <RDF:li>" << "\n";
dstf << " <RDF:Description about=\"" << sidebartabTitle << "\">\n";
@ -1462,6 +1464,7 @@ void ModifySidebar(CString inputFile, CString outputFile)
dstf << " </RDF:li>" << "\n";
}
}
}
srcf.close();
dstf.close();
@ -1692,12 +1695,15 @@ void ModifyHelpMenu(CString inputFile, CString outputFile)
srcf.getline(tempbuf,MAX_SIZE);
dstf << tempbuf << "\n";
if ((CString(tempbuf).Find(searchstr)) != -1)
{
if (!(helpMenuName.IsEmpty()) && !(helpMenuUrl.IsEmpty()))
{
dstf << " <menuitem label=\"" << helpMenuName << "\"\n";
dstf << " position=\"7\"\n";
dstf << " oncommand=\"openTopWin('" << helpMenuUrl << "');\" />\n";
}
}
}
srcf.close();
dstf.close();
@ -2274,13 +2280,13 @@ void invisible()
CString Setup1Long = "You may choose the options you want to install. Recommended for advanced users.";
WritePrivateProfileString("Setup Type0", NULL, "", iniDstPath);
WritePrivateProfileString("Setup Type1", NULL, "", iniDstPath);
WritePrivateProfileString("Setup Type2", NULL, "", iniDstPath);
WritePrivateProfileString("Setup Type0","Description Short",(LPCTSTR)Setup0Short,iniDstPath);
WritePrivateProfileString("Setup Type0","Description Long", (LPCTSTR)Setup0Long,iniDstPath);
WritePrivateProfileString("Setup Type1","Description Short",(LPCTSTR)Setup1Short,iniDstPath);
WritePrivateProfileString("Setup Type1","Description Long", (LPCTSTR)Setup1Long,iniDstPath);
WritePrivateProfileString("Setup Type2",NULL," ",iniDstPath);
WritePrivateProfileString("Setup Type2","Description Short",(LPCTSTR)Setup1Short,iniDstPath);
WritePrivateProfileString("Setup Type2","Description Long", (LPCTSTR)Setup1Long,iniDstPath);
WritePrivateProfileString("Setup Type1",NULL," ",iniDstPath);
WritePrivateProfileString("Setup Type3",NULL," ",iniDstPath);
CString Cee;
tempWidget = findWidget("SelectedComponents");
@ -2293,7 +2299,7 @@ void invisible()
component = Components[i].compname;
Cee.Format("C%d", componentOrder);
WritePrivateProfileString("Setup Type0",(LPCTSTR)Cee,(LPCTSTR)component, iniDstPath);
WritePrivateProfileString("Setup Type1",(LPCTSTR)Cee,(LPCTSTR)component, iniDstPath);
WritePrivateProfileString("Setup Type2",(LPCTSTR)Cee,(LPCTSTR)component, iniDstPath);
CString strAttributes = "SELECTED";
CString strSep = "|";
@ -2485,7 +2491,7 @@ void AddThirdParty()
componentOrder++;
WritePrivateProfileString("Setup Type0", cName, componentName, iniDstPath);
WritePrivateProfileString("Setup Type1", cName, componentName, iniDstPath);
WritePrivateProfileString("Setup Type2", cName, componentName, iniDstPath);
WritePrivateProfileSection(componentName, cBuffer1, iniDstPath);
numComponents++;
CopyFile(tpCompPath1, xpiDstPath + "\\" + Archive1, FALSE);
@ -2500,7 +2506,7 @@ void AddThirdParty()
cName.Format("C%d", componentOrder);
WritePrivateProfileString("Setup Type0", cName, componentName, iniDstPath);
WritePrivateProfileString("Setup Type1", cName, componentName, iniDstPath);
WritePrivateProfileString("Setup Type2", cName, componentName, iniDstPath);
WritePrivateProfileSection(componentName, cBuffer2, iniDstPath);
CopyFile(tpCompPath2, xpiDstPath + "\\" + Archive2, FALSE);
DWORD e2 = GetLastError();