--- a/mpx/collectionframework/collectionengine/src/mpxcollectionengine.cpp Tue Aug 31 15:41:40 2010 +0300
+++ b/mpx/collectionframework/collectionengine/src/mpxcollectionengine.cpp Wed Sep 01 12:23:05 2010 +0100
@@ -36,7 +36,6 @@
#include <mpxmessagegeneraldefs.h>
#include <mpxmessagecontainerdefs.h>
#include <mpxmessagepluginupdatedefs.h>
-#include <mmf/common/mmfcontrollerpluginresolver.h>
#include "mpxcollectionpluginhandler.h"
#include "mpxcollectioncache.h"
@@ -212,21 +211,12 @@
break;
}
case EMcMsgDiskInserted:
- {
- // inverting the notification order, this to get the message to
- // the UI faster.
for( TInt i=0; i<count; ++i )
{
context = iContexts[i];
context->NotifyL( aMsg, aData );
}
notify = EFalse;
- command = EMcReOpenCollection;
- data = aData;
- // Clear the cache
- clearCache = ETrue;
- break;
- }
case EMcMsgFormatEnd:
case EMcMsgUSBMassStorageEnd:
{
@@ -234,7 +224,7 @@
data = aData;
// Clear the cache
- clearCache = ETrue;
+ clearCache = ETrue;
break;
}
case EMcMsgUSBMTPStart:
@@ -326,7 +316,6 @@
EXPORT_C void CMPXCollectionEngine::GetSupportedTypesL(
RPointerArray<CMPXCollectionType>& aArray )
{
- CleanupResetAndDestroyPushL(aArray);
RArray<TUid> uids;
CleanupClosePushL(uids);
iPluginHandler->GetPluginUids(uids);
@@ -351,7 +340,6 @@
CleanupStack::Pop(type);
}
CleanupStack::PopAndDestroy(&uids);
- CleanupStack::Pop(&aArray);
}
// ----------------------------------------------------------------------------