diff -r 7333d7932ef7 -r 8b7f4e561641 appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp --- a/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -20,7 +20,7 @@ #include "appmngr2widgetruntime.h" // KAppMngr2WidgetUid #include "appmngr2widgetinfoiterator.h" // CAppMngr2WidgetInfoIterator #include "appmngr2widget.hrh" // Widget command IDs -#include // CWidgetInfo +#include // CWidgetInfo #include // TAppMngr2DriveUtils @@ -49,6 +49,7 @@ CancelCommand(); delete iName; delete iDetails; + delete iMimeType; } // --------------------------------------------------------------------------- @@ -116,7 +117,7 @@ CleanupStack::Pop( swInstLauncher ); iSWInstLauncher = swInstLauncher; } - iSWInstLauncher->Uninstall( aStatus, iWidgetUid, KDataTypeWidget ); + iSWInstLauncher->Uninstall( aStatus, iWidgetUid, *iMimeType ); return; // async operation started default: @@ -177,13 +178,16 @@ void CAppMngr2WidgetAppInfo::ConstructL( const CWidgetInfo& aWidget ) { CAppMngr2AppInfo::ConstructL(); - + iWidgetUid = aWidget.iUid; iName = aWidget.iBundleName->AllocL(); iDetails = SizeStringWithUnitsL( aWidget.iFileSize ); iLocationDrive = TDriveUnit( *aWidget.iDriveName ); iLocation = TAppMngr2DriveUtils::LocationFromDriveL( iLocationDrive, iFs ); + + CAppMngr2WidgetRuntime& runtime( static_cast( Runtime() ) ); + iMimeType = runtime.GetMimeTypeL( iWidgetUid ); } // ---------------------------------------------------------------------------