# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1277375934 -3600
# Node ID 489dfca94df89e7ea864bba4ef5b298b7af2ce43
# Parent  641ba6dff8d4ca9eb20e55f2f16474cf2741abfa# Parent  1509585cd8bfd4f8dbad6a91feff219e9a5e3104
Merge fix for bug 1860.

diff -r 641ba6dff8d4 -r 489dfca94df8 charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP
--- a/charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP	Fri Jun 04 10:51:39 2010 +0100
+++ b/charconvfw/Charconv/ongoing/Source/main/CHARCONV.CPP	Thu Jun 24 11:38:54 2010 +0100
@@ -1043,7 +1043,7 @@
 EXPORT_C CCnvCharacterSetConverter* CCnvCharacterSetConverter::NewLC()
 	{
 	CCnvCharacterSetConverter* characterSetConverter=new(ELeave) CCnvCharacterSetConverter;
-	characterSetConverter->iFullyConstructed=EFalse;
+	characterSetConverter->iTlsDataConstructed=EFalse;
 	CleanupStack::PushL(characterSetConverter);
 	characterSetConverter->ConstructL();
 	return characterSetConverter;
@@ -1056,7 +1056,7 @@
 	{
 	delete iStandardNamesAndMibEnums;
 	FeatureManager::UnInitializeLib();
-	if (iFullyConstructed)
+	if (iTlsDataConstructed)
 		{
 		TTlsData::CharacterSetConverterIsBeingDestroyed();		
 		}
@@ -2808,7 +2808,7 @@
 	iCharsetCnvCache = CCharsetCnvCache::NewL();
 	TTlsData::CharacterSetConverterIsBeingCreatedL();
 	FeatureManager::InitializeLibL();
-	iFullyConstructed = ETrue;
+	iTlsDataConstructed = ETrue;
 	}
 
 // set aIdentifierOfOnlyCharacterSetOfInterest to 0 if all character sets are of interest
diff -r 641ba6dff8d4 -r 489dfca94df8 textandloc_pub/character_conversion_api/inc/CHARCONV.H
--- a/textandloc_pub/character_conversion_api/inc/CHARCONV.H	Fri Jun 04 10:51:39 2010 +0100
+++ b/textandloc_pub/character_conversion_api/inc/CHARCONV.H	Thu Jun 24 11:38:54 2010 +0100
@@ -614,7 +614,7 @@
 	TDowngradeForExoticLineTerminatingCharacters iDowngradeForExoticLineTerminatingCharacters;
 	TBuf8<KMaximumLengthOfReplacementForUnconvertibleUnicodeCharacters> iReplacementForUnconvertibleUnicodeCharacters;
 	CStandardNamesAndMibEnums* iStandardNamesAndMibEnums;
-	TBool iFullyConstructed;
+	TBool iTlsDataConstructed;
 	CCharsetCnvCache* iCharsetCnvCache;
 	};