From 98369779bc0146b601aa9ec5e0696117f6d4296e Mon Sep 17 00:00:00 2001
From: "shrutiv%netscape.com" <shrutiv%netscape.com>
Date: Wed, 3 Oct 2001 00:01:48 +0000
Subject: [PATCH] Fix for bug 96735: cck.che variables for custom components
 are confusing Changing variable names for custom components (r=tao)

---
 cck/cckwiz/iniFiles/Default.che     |  4 ++--
 cck/cckwiz/iniFiles/MyIsp.che       | 12 ++++++------
 cck/cckwiz/iniFiles/build_page1.ini | 16 ++++++++--------
 cck/driver/cck.che                  |  4 ++--
 cck/ib/ib.cpp                       | 12 ++++++------
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/cck/cckwiz/iniFiles/Default.che b/cck/cckwiz/iniFiles/Default.che
index 91dfd841a79..607bf802c92 100644
--- a/cck/cckwiz/iniFiles/Default.che
+++ b/cck/cckwiz/iniFiles/Default.che
@@ -28,6 +28,6 @@ ShellBelowTitleText=
 ShellInstallTextFile=%Root%Configs\Default\Workspace\Autorun\install.txt
 IntSetupBgBitmap=%Root%Configs\Default\Workspace\ISetup\nscplogo.gif
 Company_Name=
-CustomComponent1=Please select an executable to install.
-CustomComponent137=Please select an executable to install.
+CustomComponentPath1=Please select an executable to install.
+CustomComponentPath2=Please select an executable to install.
 NCIFileEditor=notepad
diff --git a/cck/cckwiz/iniFiles/MyIsp.che b/cck/cckwiz/iniFiles/MyIsp.che
index 789ec98aaac..efb39cdc8bb 100644
--- a/cck/cckwiz/iniFiles/MyIsp.che
+++ b/cck/cckwiz/iniFiles/MyIsp.che
@@ -28,10 +28,10 @@ ShellBelowTitleText=MyIsp
 ShellInstallTextFile=%Root%Configs\MyIsp\Workspace\Autorun\install.txt
 IntSetupBgBitmap=
 Company_Name=
-CustomComponent1=Please select an executable to install.
-CustomComponent137=Please select an executable to install.
-CustomComponent1=
-ComponentSize=
-CustomComponent137=
-ModuleSize=
+CustomComponentPath1=Please select an executable to install.
+CustomComponentPath2=Please select an executable to install.
+CustomComponentSize1=
+CustomComponentSize2=
+CustomComponentDesc1=
+CustomComponentDesc2=
 NCIFileEditor=notepad
diff --git a/cck/cckwiz/iniFiles/build_page1.ini b/cck/cckwiz/iniFiles/build_page1.ini
index c37363d8cc8..1b98d31e9bd 100644
--- a/cck/cckwiz/iniFiles/build_page1.ini
+++ b/cck/cckwiz/iniFiles/build_page1.ini
@@ -134,7 +134,7 @@ Height=29
 
 [Widget 5]
 Type=EditBox
-Name=CustomComponent1
+Name=CustomComponentPath1
 Value=
 Start_x=150
 Start_y=97
@@ -150,11 +150,11 @@ Start_y=97
 Width=50
 Height=14
 onCommand=BrowseFile()
-target=CustomComponent1
+target=CustomComponentPath1
 
 [Widget 8]
 Type=EditBox
-Name=CustomComponent2
+Name=CustomComponentDesc1
 Value=
 Start_x=150
 Start_y=125
@@ -181,7 +181,7 @@ Height=10
 
 [Widget 868]
 Type=EditBox
-Name=ComponentSize
+Name=CustomComponentSize1
 Value=
 Start_x=330
 Start_y=125
@@ -200,7 +200,7 @@ Height=15
 
 [Widget 7]
 Type=EditBox
-Name=CustomComponent137
+Name=CustomComponentPath2
 Value=
 Start_x=150
 Start_y=169
@@ -216,11 +216,11 @@ Start_y=168
 Width=50
 Height=14
 onCommand=BrowseFile()
-target=CustomComponent137
+target=CustomComponentPath2
 
 [Widget 843]
 Type=EditBox
-Name=CustomComponent23
+Name=CustomComponentDesc2
 Value=
 Start_x=150
 Start_y=198
@@ -247,7 +247,7 @@ Height=10
 
 [Widget 8686]
 Type=EditBox
-Name=ModuleSize
+Name=CustomComponentSize2
 Value=
 Start_x=330
 Start_y=198
diff --git a/cck/driver/cck.che b/cck/driver/cck.che
index c379ed97baa..0cf5cac8f77 100644
--- a/cck/driver/cck.che
+++ b/cck/driver/cck.che
@@ -30,8 +30,8 @@ ShellInstallTextFile=%Root%Configs\Default\Workspace\Autorun\install.txt
 IntSetupBgBitmap=%Root%Configs\Default\Workspace\ISetup\nscplogo.gif
 Company_Name=
 TechSupportNumber=
-CustomComponent1=Please select an executable to install.
-CustomComponent137=Please select an executable to install.
+CustomComponentPath1=Please select an executable to install.
+CustomComponentPath2=Please select an executable to install.
 NCIFileEditor=notepad
 FTPportno=0
 Gopherportno=0
diff --git a/cck/ib/ib.cpp b/cck/ib/ib.cpp
index 354c716399f..dc2454c77ca 100644
--- a/cck/ib/ib.cpp
+++ b/cck/ib/ib.cpp
@@ -884,12 +884,12 @@ void LinuxInvisible()
 
 void AddThirdParty()
 {
-	CString tpCompPath1 = GetGlobal("CustomComponent1");
-	CString tpCompPath2 = GetGlobal("CustomComponent137");
-	CString tpComp1		= GetGlobal("CustomComponent2");
-	CString tpComp2		= GetGlobal("CustomComponent23");
-	CString tpCompSize1	= GetGlobal("ComponentSize");
-	CString tpCompSize2	= GetGlobal("ModuleSize");
+	CString tpCompPath1 = GetGlobal("CustomComponentPath1");
+	CString tpCompPath2 = GetGlobal("CustomComponentPath2");
+	CString tpComp1		= GetGlobal("CustomComponentDesc1");
+	CString tpComp2		= GetGlobal("CustomComponentDesc2");
+	CString tpCompSize1	= GetGlobal("CustomComponentSize1");
+	CString tpCompSize2	= GetGlobal("CustomComponentSize2");
 	CString componentName;
 	CString cName;
 	CString compSDesc	= "Description Short=";