diff -r bf7eb7911fc5 -r 997a02608b3a emailservices/emailcommon/src/CFSMailBox.cpp
--- a/emailservices/emailcommon/src/CFSMailBox.cpp Wed Jun 23 18:00:21 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailBox.cpp Tue Jul 06 14:04:34 2010 +0300
@@ -77,7 +77,7 @@
EXPORT_C CFSMailBox::~CFSMailBox()
{
NM_FUNCTION;
-
+ // Not using KMailboxExtMrCalInfo
iFolders.ResetAndDestroy();
}
@@ -456,11 +456,7 @@
if(CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(GetId()))
{
- // Not activated yet.
- //UpdateMrusL( aMessage.GetToRecipients(),
- // aMessage.GetCCRecipients(),
- // aMessage.GetBCCRecipients() );
- //
+ // Removed UpdateMrusL.
plugin->SendMessageL( aMessage );
}
}
@@ -481,11 +477,7 @@
if ( plugin )
{
- // Not activated yet.
- //UpdateMrusL( aMessage.GetToRecipients(),
- // aMessage.GetCCRecipients(),
- // aMessage.GetBCCRecipients() );
- //
+ // Removed UpdateMrusL.
// init asynchronous request
request = iRequestHandler->InitAsyncRequestL( GetId().PluginId(),
@@ -555,6 +547,11 @@
EXPORT_C TDesC& CFSMailBox::GetBrandingIdL( )
{
NM_FUNCTION;
+ if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
+ {
+ TDesC& result = plugin->GetBrandingIdL( GetId() );
+ return result;
+ }
return BrandingId();
}
@@ -585,6 +582,7 @@
NM_FUNCTION;
TFSPendingRequest request;
+ request.iRequestId = 0;
if( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid( GetId() ) )
{
// init asynchronous request
@@ -650,7 +648,7 @@
// remove outbox, drafts folder from folder list
RArray folderIds;
- folderIds.Reset();
+ CleanupClosePushL( folderIds );
for(TInt i=0;iGetFolderId();
@@ -662,7 +660,7 @@
// start search
plugin->SearchL( GetId(), folderIds, aSearchStrings, aSortCriteria, aSearchObserver );
- folderIds.Reset();
+ CleanupStack::PopAndDestroy( &folderIds );
}
}
@@ -1067,9 +1065,11 @@
EXPORT_C void CFSMailBox::ReleaseExtension( CEmailExtension* aExtension )
{
NM_FUNCTION;
+ // Not using KMailboxExtMrCalInfo
// no specialized behaviour, call base class
CExtendableEmail::ReleaseExtension( aExtension );
+ //
}
// -----------------------------------------------------------------------------
@@ -1094,6 +1094,7 @@
}
}
else if ( aInterfaceUid == KEmailMailboxStateExtensionUid )
+ // Not using KEmailSettingExtensionUid or KEmailConnectionStatusQueryExtensionUid
{
if ( !extension )
{