1.1 --- a/epoc32/include/app/imapset.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/app/imapset.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -575,6 +575,13 @@
    1.16  	IMPORT_C TBool UseSyncDownloadRules();
    1.17  	IMPORT_C void SetFolderSyncDisabled(TBool aFlag);
    1.18  	IMPORT_C TBool FolderSyncDisabled();
    1.19 +	
    1.20 +#if (defined SYMBIAN_EMAIL_CAPABILITY_SUPPORT)
    1.21 +	IMPORT_C TBool IMAP4Auth() const;
    1.22 +	IMPORT_C void SetIMAP4Auth(TBool aFlag);
    1.23 +	IMPORT_C TBool FallBack() const;
    1.24 +	IMPORT_C void SetFallBack(TBool aFlag);
    1.25 +#endif
    1.26  
    1.27  private:
    1.28  	class TImImap4SettingsExtension
    1.29 @@ -602,16 +609,22 @@
    1.30  		{
    1.31  		KImap4EmailSettingsClearFlag				= 0x00000000,
    1.32  		KImap4BaseEmailSettingsLastUsedFlag			= CImBaseEmailSettings::EBaseEmailSettingsLastUsedFlag, //0x00000002
    1.33 -		KImap4EmailDisconnectedModeFlag				= KImap4BaseEmailSettingsLastUsedFlag << 1, //0x00000004
    1.34 -		KImap4EmailAutoSendFlag						= KImap4EmailDisconnectedModeFlag << 1, //0x00000008
    1.35 -		KImap4EmailDeleteEmailsWhenDisconnecting	= KImap4EmailAutoSendFlag << 1, //0x00000010
    1.36 -		KImap4EmailAcknowledgeReceipts				= KImap4EmailDeleteEmailsWhenDisconnecting << 1, //0x00000020
    1.37 -		KImap4EmailUpdatingSeenFlags				= KImap4EmailAcknowledgeReceipts << 1, //0x00000040
    1.38 -		KImap4EmailIdleFlag							= KImap4EmailUpdatingSeenFlags << 1, //0x00000080
    1.39 +		KImap4EmailDisconnectedModeFlag				= KImap4BaseEmailSettingsLastUsedFlag << 1, 	//0x00000004
    1.40 +		KImap4EmailAutoSendFlag						= KImap4EmailDisconnectedModeFlag << 1, 		//0x00000008
    1.41 +		KImap4EmailDeleteEmailsWhenDisconnecting	= KImap4EmailAutoSendFlag << 1, 				//0x00000010
    1.42 +		KImap4EmailAcknowledgeReceipts				= KImap4EmailDeleteEmailsWhenDisconnecting << 1,//0x00000020
    1.43 +		KImap4EmailUpdatingSeenFlags				= KImap4EmailAcknowledgeReceipts << 1, 			//0x00000040
    1.44 +		KImap4EmailIdleFlag							= KImap4EmailUpdatingSeenFlags << 1, 			//0x00000080
    1.45  		KImap4EmailExpungeFlag						= KImap4EmailIdleFlag << 1,
    1.46 -		KImap4EmailUseSyncDownloadRules				= KImap4EmailExpungeFlag << 1, //0x00000200
    1.47 -		KImap4EmailSettingsFolderSyncDisabled		= KImap4EmailUseSyncDownloadRules << 1, //0x00000400
    1.48 -		KImap4EmailSettingsLastUsedFlag				= KImap4EmailSettingsFolderSyncDisabled
    1.49 +		KImap4EmailUseSyncDownloadRules				= KImap4EmailExpungeFlag << 1, 					//0x00000200
    1.50 +		KImap4EmailSettingsFolderSyncDisabled		= KImap4EmailUseSyncDownloadRules << 1, 		//0x00000400
    1.51 +#if (defined SYMBIAN_EMAIL_CAPABILITY_SUPPORT)
    1.52 +		KImap4EmailSettingsAuthenticationFlag 		= KImap4EmailSettingsFolderSyncDisabled << 1, 	//0x00000800
    1.53 +		KImap4EmailSettingsFallBackFlag	 			= KImap4EmailSettingsAuthenticationFlag << 1, 	//0x00001000
    1.54 +		KImap4EmailSettingsLastUsedFlag				= KImap4EmailSettingsFallBackFlag   			//0x00001000
    1.55 +#else
    1.56 +		KImap4EmailSettingsLastUsedFlag				= KImap4EmailSettingsFolderSyncDisabled    		//0x00000400
    1.57 +#endif
    1.58  		};
    1.59  
    1.60  	TImImap4SettingsExtension*	iExtension; // renamed iReceiptAddress