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

Fix for bug 86505: Bookmark & Sidebar customization in CCK Tool not picked up 

r=bobj
This commit is contained in:
shrutiv%netscape.com 2001-06-22 02:19:34 +00:00
Родитель 0988c2925e
Коммит 263a248a83
1 изменённых файлов: 3 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -95,7 +95,7 @@ int ReplaceXPIFiles()
xpiArcDest = xpiDstPath + "\\" + xpiList[i].xpiname; //xpiDstPath=CCKTool\Configs\ configName\Output\Core xpiArcDest = xpiDstPath + "\\" + xpiList[i].xpiname; //xpiDstPath=CCKTool\Configs\ configName\Output\Core
if (!CopyFile(xpiArchive, xpiArcDest, TRUE)) if (!CopyFile(xpiArchive, xpiArcDest, TRUE))
DWORD e = GetLastError(); DWORD e = GetLastError();
if ((strcmp(xpiList[i].filename,"bin/defaults/isp/Us") == 0) || (strcmp(xpiList[i].filename,"bin/defaults/isp") == 0)) if ((strcmp(xpiList[i].filename,"bin/defaults/isp/US") == 0) || (strcmp(xpiList[i].filename,"bin/defaults/isp") == 0))
command = quotes + rootPath + "zip.exe" + quotes + "-m " + spaces + quotes +xpiArcDest + quotes + spaces + quotes + xpiList[i].filename + "/*.*" + quotes; command = quotes + rootPath + "zip.exe" + quotes + "-m " + spaces + quotes +xpiArcDest + quotes + spaces + quotes + xpiList[i].filename + "/*.*" + quotes;
else else
command = quotes + rootPath + "zip.exe" + quotes + "-m " + spaces + quotes +xpiArcDest + quotes + spaces + quotes + xpiList[i].filename + quotes; command = quotes + rootPath + "zip.exe" + quotes + "-m " + spaces + quotes +xpiArcDest + quotes + spaces + quotes + xpiList[i].filename + quotes;
@ -536,12 +536,11 @@ int interpret(char *cmd)
} }
// nscpxpipath = \CCKTool\NSCPXPI // nscpxpipath = \CCKTool\NSCPXPI
CString xpiArchive = nscpxpiPath + "\\" + xpiname; CString xpiArchive = nscpxpiPath + "\\" + xpiname;
// decompress the XPI file // decompressing the directory path within the XPI file
command = quotes +rootPath + "unzip.exe"+ quotes + "-o" + spaces + quotes + xpiArchive + quotes; command = quotes +rootPath + "unzip.exe"+ quotes + "-o" + spaces + quotes + xpiArchive + quotes + spaces + quotes + xpifile + "/*.*" + quotes;
ExecuteCommand((char *)(LPCTSTR) command, SW_HIDE, INFINITE); ExecuteCommand((char *)(LPCTSTR) command, SW_HIDE, INFINITE);
CString xpifile1 = xpifile; CString xpifile1 = xpifile;
//CString newxpifile = xpifile1 + "/mailaccount.rdf";
CString tempval=value2; CString tempval=value2;
CString newxpifile = xpifile1 + "/" + tempval; CString newxpifile = xpifile1 + "/" + tempval;