diff -r 578830873419 -r ecc8def7944a emailservices/emailstore/base_plugin/inc/BasePlugin.h
--- a/emailservices/emailstore/base_plugin/inc/BasePlugin.h Fri Apr 16 14:51:52 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/BasePlugin.h Mon May 03 12:23:15 2010 +0300
@@ -34,7 +34,9 @@
#include "DebugLogMacros.h"
//
+// Entire CBasePlugin class is exported in 10.1
#include "baseplugindef.h"
+//
#include "basemrinfoobject.h"
#include "Map.h"
@@ -201,12 +203,12 @@
virtual CFSMailMessage* CreateMessageToSendL(
const TFSMailMsgId& aMailBox );
- //
+//
virtual void CreateMessageToSendL(
const TFSMailMsgId& aMailBoxId,
MFSMailRequestObserver& aOperationObserver,
const TInt aRequestId );
- //
+//
virtual CFSMailMessage* CreateForwardMessageL(
const TFSMailMsgId& aMailBox,
@@ -223,20 +225,20 @@
const TFSMailMsgId& aMailBoxId,
CFSMailMessage& aMessage );
- //
+//
void StoreMessagesL(
const TFSMailMsgId& aMailBoxId,
RPointerArray &messages,
MFSMailRequestObserver& aOperationObserver,
const TInt aRequestId );
- //
+//
- //
+//
virtual void StoreMessagePartsL(
RPointerArray& aMessageParts,
MFSMailRequestObserver& aOperationObserver,
const TInt aRequestId);
- // /qmail>
+// /qmail>
virtual void FetchMessagesL(
const TFSMailMsgId& aMailBoxId,
@@ -656,7 +658,7 @@
const TDesC8& aDstProperty,
RPointerArray& aRecipients );
- static void RemoveAllPropertiesL(
+ static void RemoveAllPropertiesL(
CMsgStorePropertyContainer& aContainer,
const TDesC8& aName );
@@ -776,6 +778,8 @@
TMsgStoreId aId,
TMsgStoreId aParentId,
TMsgStoreId aOtherId );
+
+ virtual const TDesC& CBasePlugin::CalendarFileName() const;
public:
@@ -808,7 +812,7 @@
TCacheLine iCacheLine;
private:
-
+ protected:
MDelayedOpsManager* iDelayedOpsManager;
/**
@@ -848,14 +852,16 @@
virtual ~CMailboxInfo()
{
- iMailBox->RemoveObserverL( iBasePlugin );
+ if ( iMailBox )
+ iMailBox->RemoveObserverL( iBasePlugin );
+
iObservers.Close();
delete iMailBoxName;
delete iMailBoxDisplayName;
delete iBrandingId;
delete iMailBox;
- }
+ };
CMsgStoreMailBox& operator() ()
{