From 263a248a83d85a43c2a5b11e25c7ff75a53e2232 Mon Sep 17 00:00:00 2001 From: "shrutiv%netscape.com" Date: Fri, 22 Jun 2001 02:19:34 +0000 Subject: [PATCH] Fix for bug 86505: Bookmark & Sidebar customization in CCK Tool not picked up r=bobj --- cck/ib/ib.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cck/ib/ib.cpp b/cck/ib/ib.cpp index db98f825cac..50b8596e288 100644 --- a/cck/ib/ib.cpp +++ b/cck/ib/ib.cpp @@ -95,7 +95,7 @@ int ReplaceXPIFiles() xpiArcDest = xpiDstPath + "\\" + xpiList[i].xpiname; //xpiDstPath=CCKTool\Configs\ configName\Output\Core if (!CopyFile(xpiArchive, xpiArcDest, TRUE)) 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; else 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 CString xpiArchive = nscpxpiPath + "\\" + xpiname; - // decompress the XPI file - command = quotes +rootPath + "unzip.exe"+ quotes + "-o" + spaces + quotes + xpiArchive + quotes; + // decompressing the directory path within the XPI file + command = quotes +rootPath + "unzip.exe"+ quotes + "-o" + spaces + quotes + xpiArchive + quotes + spaces + quotes + xpifile + "/*.*" + quotes; ExecuteCommand((char *)(LPCTSTR) command, SW_HIDE, INFINITE); CString xpifile1 = xpifile; - //CString newxpifile = xpifile1 + "/mailaccount.rdf"; CString tempval=value2; CString newxpifile = xpifile1 + "/" + tempval;