equal
deleted
inserted
replaced
224 iFeaturesReady = ETrue; // No need to read files anymore |
224 iFeaturesReady = ETrue; // No need to read files anymore |
225 DeletePlugins(); |
225 DeletePlugins(); |
226 } |
226 } |
227 |
227 |
228 delete iTimer; |
228 delete iTimer; |
229 iFs.Close(); |
|
230 iPluginList.Close(); |
229 iPluginList.Close(); |
231 |
230 |
232 // De register Backup and Restore and cleanup memory |
231 // De register Backup and Restore and cleanup memory |
233 if( iBackupNotification ) |
232 if( iBackupNotification ) |
234 { |
233 { |
237 delete iBackupNotification; |
236 delete iBackupNotification; |
238 iBackupNotification = NULL; |
237 iBackupNotification = NULL; |
239 } |
238 } |
240 |
239 |
241 delete iRegistry; |
240 delete iRegistry; |
|
241 iFs.Close(); |
242 } |
242 } |
243 |
243 |
244 |
244 |
245 // ----------------------------------------------------------------------------- |
245 // ----------------------------------------------------------------------------- |
246 // CFeatMgrServer::NewSessionL |
246 // CFeatMgrServer::NewSessionL |
526 |
526 |
527 for ( TInt i = 0; i < pluginCount; i ++ ) |
527 for ( TInt i = 0; i < pluginCount; i ++ ) |
528 { |
528 { |
529 if ( iPluginList[i].iPluginHandler == aPluginHandler ) |
529 if ( iPluginList[i].iPluginHandler == aPluginHandler ) |
530 { |
530 { |
531 iRegistry->MergePluginFeatures( aFeatureList ); |
531 iRegistry->MergePluginFeaturesL( aFeatureList ); |
532 // Send command to load enhanced feature info |
532 // Send command to load enhanced feature info |
533 TRAPD( err, iPluginList[i].iPluginHandler->SendCommandL( |
533 TRAPD( err, iPluginList[i].iPluginHandler->SendCommandL( |
534 FeatureInfoCommand::ELoadEnhancedFeatureInfoCmdId ) ); |
534 FeatureInfoCommand::ELoadEnhancedFeatureInfoCmdId ) ); |
535 // Panic if error sth else than not supported |
535 // Panic if error sth else than not supported |
536 if ( err != KErrNone && err != KErrNotSupported ) |
536 if ( err != KErrNone && err != KErrNotSupported ) |
570 |
570 |
571 for ( TInt i = 0; i < pluginCount; i ++ ) |
571 for ( TInt i = 0; i < pluginCount; i ++ ) |
572 { |
572 { |
573 if ( iPluginList[i].iPluginHandler == aPluginHandler ) |
573 if ( iPluginList[i].iPluginHandler == aPluginHandler ) |
574 { |
574 { |
575 iRegistry->MergePluginFeatures( aFeatureList ); |
575 iRegistry->MergePluginFeaturesL( aFeatureList ); |
576 // Send another command if something left to process |
576 // Send another command if something left to process |
577 iPluginList[i].iPluginReady = ETrue; |
577 iPluginList[i].iPluginReady = ETrue; |
578 } |
578 } |
579 else |
579 else |
580 { |
580 { |
818 * Discover which features have changes wrt the restore operation |
818 * Discover which features have changes wrt the restore operation |
819 */ |
819 */ |
820 void CFeatMgrServer::HandleRestoredNotificationsL( void ) |
820 void CFeatMgrServer::HandleRestoredNotificationsL( void ) |
821 { |
821 { |
822 iRegistry->HandleRestoredFeatureNotificationsL(); |
822 iRegistry->HandleRestoredFeatureNotificationsL(); |
823 |
|
824 return; |
|
825 } |
823 } |
826 |
824 |
827 /** |
825 /** |
828 * This function will clear features from RAM |
826 * This function will clear features from RAM |
829 */ |
827 */ |