equal
deleted
inserted
replaced
261 delete iIconConfigMap; |
261 delete iIconConfigMap; |
262 |
262 |
263 iWallpaperCache->ResetAndDestory( ); |
263 iWallpaperCache->ResetAndDestory( ); |
264 |
264 |
265 iSlidesetEnableAppUidArray.Close(); |
265 iSlidesetEnableAppUidArray.Close(); |
|
266 |
|
267 if ( iPackageArray ) |
|
268 { |
|
269 iPackageArray->ResetAndDestroy(); |
|
270 delete iPackageArray; |
|
271 iPackageArray = NULL; |
|
272 } |
266 } |
273 } |
267 |
274 |
268 // ----------------------------------------------------------------------------- |
275 // ----------------------------------------------------------------------------- |
269 // CAknsSrv::NewSessionL |
276 // CAknsSrv::NewSessionL |
270 // ----------------------------------------------------------------------------- |
277 // ----------------------------------------------------------------------------- |
1463 if ( err ) |
1470 if ( err ) |
1464 { |
1471 { |
1465 User::LeaveIfError( err ); |
1472 User::LeaveIfError( err ); |
1466 } |
1473 } |
1467 |
1474 |
1468 isprotected = AknsSrvUtils::IsDrmProtectedL(aFilename); |
|
1469 if (!BaflUtils::FileExists(iFsSession, aFilename)) |
1475 if (!BaflUtils::FileExists(iFsSession, aFilename)) |
1470 { |
1476 { |
1471 iSettings->WriteIdleBackgroundToDefault(); |
1477 iSettings->WriteIdleBackgroundToDefault(); |
1472 return; |
1478 return; |
1473 } |
1479 } |
1474 } |
1480 } |
1475 } |
1481 |
|
1482 isprotected = AknsSrvUtils::IsDrmProtectedL(aFilename); |
|
1483 } |
|
1484 |
1476 if (isprotected) |
1485 if (isprotected) |
1477 { |
1486 { |
1478 CheckAndCreateDRMHelper(); |
1487 CheckAndCreateDRMHelper(); |
1479 |
1488 |
1480 // Get fileInfo |
1489 // Get fileInfo |
2279 } |
2288 } |
2280 TPtr8 pkgptr((TUint8*)( iPackageArray->At(count)), |
2289 TPtr8 pkgptr((TUint8*)( iPackageArray->At(count)), |
2281 sizeof(TAknsSrvSkinInfoPkg),sizeof(TAknsSrvSkinInfoPkg)); |
2290 sizeof(TAknsSrvSkinInfoPkg),sizeof(TAknsSrvSkinInfoPkg)); |
2282 aMessage.Write(1,pkgptr,count*sizeof(TAknsSrvSkinInfoPkg)); |
2291 aMessage.Write(1,pkgptr,count*sizeof(TAknsSrvSkinInfoPkg)); |
2283 } |
2292 } |
2284 if ( iPackageArray ) |
|
2285 { |
|
2286 iPackageArray->ResetAndDestroy(); |
|
2287 } |
|
2288 delete iPackageArray; |
|
2289 iPackageArray = NULL; |
|
2290 } |
2293 } |
2291 |
2294 |
2292 // ----------------------------------------------------------------------------- |
2295 // ----------------------------------------------------------------------------- |
2293 // CAknsSrv::DecodeWallpaperImageL |
2296 // CAknsSrv::DecodeWallpaperImageL |
2294 // ----------------------------------------------------------------------------- |
2297 // ----------------------------------------------------------------------------- |