From 3f1867e0a85cf563e254a233fe43155b3f7af112 Mon Sep 17 00:00:00 2001
From: "shrutiv%netscape.com" <shrutiv%netscape.com>
Date: Wed, 26 Jun 2002 00:05:32 +0000
Subject: [PATCH] Fix for bugscape bug 11275: Update CCK version strings to 7.0
 (r=mitchf)

---
 cck/cckwiz/iniFiles/CheckList.ini     | 2 +-
 cck/cckwiz/iniFiles/Info.ini          | 2 +-
 cck/cckwiz/iniFiles/Platform_page.ini | 4 ++--
 cck/driver/WizardMachine.rc           | 8 ++++----
 cck/driver/cck.che                    | 2 +-
 cck/ib/wizshell.cpp                   | 2 +-
 cck/initdist.win                      | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cck/cckwiz/iniFiles/CheckList.ini b/cck/cckwiz/iniFiles/CheckList.ini
index f5fe0e768b61..5e7d4167f0ba 100644
--- a/cck/cckwiz/iniFiles/CheckList.ini
+++ b/cck/cckwiz/iniFiles/CheckList.ini
@@ -22,7 +22,7 @@
 
 [Local Variables]
 Name=CheckList
-Title=Welcome to the %DefaultName% Client Customization Kit 
+Title=Welcome to the %DefaultName% Client Customization Kit 7.0
 Caption=1st level node
 ;Help=Online;http://www.mozilla.org/projects/cck/
 Help=Online;%Root%CCKHelp\checklist.html
diff --git a/cck/cckwiz/iniFiles/Info.ini b/cck/cckwiz/iniFiles/Info.ini
index 9727579f2a7f..77f92cddf9c6 100644
--- a/cck/cckwiz/iniFiles/Info.ini
+++ b/cck/cckwiz/iniFiles/Info.ini
@@ -186,7 +186,7 @@ onCommand=DisplayImage(string.ini)
 [Widget 7]
 Type=Text
 Name=Text105
-Value=The Company Identifier is included as part of the browser's user agent string. For example, if your company name is Net Advantage, you can enter NetAdvanta as your company identifier. The resulting user agent string would be: Mozilla/5.0 (Windows;U;WinNT4.0;en-US;rv:0.9.4) Gecko/20010927 Netscape 6/6.2 (CK-NetAdvanta).
+Value=The Company Identifier is included as part of the browser's user agent string. For example, if your company name is Net Advantage, you can enter NetAdvanta as your company identifier. The resulting user agent string would be: Mozilla/5.0 (Windows;U;WinNT4.0;en-US;rv:1.0.0) Gecko/20020626 Netscape/7.0 (CK-NetAdvanta).
 Start_x=8
 Start_y=188
 Width=380
diff --git a/cck/cckwiz/iniFiles/Platform_page.ini b/cck/cckwiz/iniFiles/Platform_page.ini
index 93e53d934404..e0badbb85ea1 100644
--- a/cck/cckwiz/iniFiles/Platform_page.ini
+++ b/cck/cckwiz/iniFiles/Platform_page.ini
@@ -23,7 +23,7 @@ Name=Platform_page
 Title=<%CustomizationList%> - Specify Operating System and Language
 Caption=2nd level node
 Help=Online;%Root%CCKHelp\platform.html
-Version=6.5
+Version=7.0
 
 [Navigation Controls]
 onNext=
@@ -122,7 +122,7 @@ onCommand=GenerateLocaleNameList(self,%Root%Version\%Version%\%lPlatform%\*.*)
 ;[Widget 10888]
 ;Type=DropBox
 ;Name=Version
-;Value=6.5
+;Value=7.0
 ;Start_x=130
 ;Start_y=154
 ;Width=65
diff --git a/cck/driver/WizardMachine.rc b/cck/driver/WizardMachine.rc
index 02f8a3a7340c..715973fce709 100644
--- a/cck/driver/WizardMachine.rc
+++ b/cck/driver/WizardMachine.rc
@@ -304,8 +304,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,0,0
- PRODUCTVERSION 6,2,0,0
+ FILEVERSION 7,0,0,0
+ PRODUCTVERSION 7,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -322,13 +322,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Netscape Communications Corporation\0"
             VALUE "FileDescription", "WIZARDMACHINE Application\0"
-            VALUE "FileVersion", "6.2.0.0\0"
+            VALUE "FileVersion", "7.0.0.0\0"
             VALUE "InternalName", "WIZARDMACHINE\0"
             VALUE "LegalCopyright", "Copyright (c) Netscape Communications, 2001\0"
             VALUE "LegalTrademarks", "Netscape, Mozilla\0"
             VALUE "OriginalFilename", "WIZARDMACHINE.EXE\0"
             VALUE "ProductName", "NETSCAPE CCK\0"
-            VALUE "ProductVersion", "6.2\0"
+            VALUE "ProductVersion", "7.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cck/driver/cck.che b/cck/driver/cck.che
index ba1237adc6ae..bec57c005500 100644
--- a/cck/driver/cck.che
+++ b/cck/driver/cck.che
@@ -35,7 +35,7 @@ Gopherportno=0
 HTTPportno=0
 SSLportno=0
 SOCKSportno=0
-Version=6.5
+Version=7.0
 lPlatform=Windows
 Language=English-United States (enus)
 ClientVersion=7.0
diff --git a/cck/ib/wizshell.cpp b/cck/ib/wizshell.cpp
index 5f0041c9ce31..82a8bce3ff10 100644
--- a/cck/ib/wizshell.cpp
+++ b/cck/ib/wizshell.cpp
@@ -38,7 +38,7 @@ void CreateRshell (void)
 //	FILE* rshell = theApp.OpenAFile(CDdir +"rshell.ini", "w");
 
 	ofstream rshell(Rsh);
-	CString captionValue = "Netscape 7.0" ;
+	CString captionValue = GetGlobal("BrowserName");
 	CString netscapeValue = "Netscape by ";
 	CString fvalue1=GetGlobal("ShellTitleText");
 	CString fvalue2=GetGlobal("ShellBgBitmap");
diff --git a/cck/initdist.win b/cck/initdist.win
index 1a3ed2f02548..9f35b3c57d3b 100644
--- a/cck/initdist.win
+++ b/cck/initdist.win
@@ -20,7 +20,7 @@
 # Contributor(s): 
 
 CCKDIST=$(DEPTH)\cck\dist
-VERSION=6.5
+VERSION=7.0
 
 #NSZIP=$(DEPTH)\xpinstall\wizard\windows\nszip