311 { |
311 { |
312 iCpsWrapper = CCpsWrapper::NewL( *this ); |
312 iCpsWrapper = CCpsWrapper::NewL( *this ); |
313 iHspsWrapper = CHspsWrapper::NewL( aUid, this ); |
313 iHspsWrapper = CHspsWrapper::NewL( aUid, this ); |
314 iRepository= CRepository::NewL( TUid::Uid( KCRUidActiveIdleLV ) ); |
314 iRepository= CRepository::NewL( TUid::Uid( KCRUidActiveIdleLV ) ); |
315 iOomSysHandler = CXnOomSysHandler::NewL(); |
315 iOomSysHandler = CXnOomSysHandler::NewL(); |
316 iNotifyWidgetListChanged = CPeriodic::New( CActive::EPriorityIdle ); |
316 iNotifyWidgetListChanged = CPeriodic::NewL( CActive::EPriorityIdle ); |
317 iNotifyViewListChanged = CPeriodic::New( CActive::EPriorityIdle ); |
317 iNotifyViewListChanged = CPeriodic::NewL( CActive::EPriorityIdle ); |
318 } |
318 } |
319 |
319 |
320 // --------------------------------------------------------------------------- |
320 // --------------------------------------------------------------------------- |
321 // CXnEditor::~CXnEditor |
321 // CXnEditor::~CXnEditor |
322 // --------------------------------------------------------------------------- |
322 // --------------------------------------------------------------------------- |
323 // |
323 // |
324 CXnEditor::~CXnEditor() |
324 CXnEditor::~CXnEditor() |
325 { |
325 { |
326 if ( iNotifyWidgetListChanged->IsActive() ) |
326 if ( iNotifyWidgetListChanged && |
|
327 iNotifyWidgetListChanged->IsActive() ) |
327 { |
328 { |
328 iNotifyWidgetListChanged->Cancel(); |
329 iNotifyWidgetListChanged->Cancel(); |
329 } |
330 } |
330 delete iNotifyWidgetListChanged; |
331 delete iNotifyWidgetListChanged; |
331 |
332 |
332 if ( iNotifyViewListChanged->IsActive() ) |
333 if ( iNotifyViewListChanged && |
|
334 iNotifyViewListChanged->IsActive() ) |
333 { |
335 { |
334 iNotifyViewListChanged->Cancel(); |
336 iNotifyViewListChanged->Cancel(); |
335 } |
337 } |
336 delete iNotifyViewListChanged; |
338 delete iNotifyViewListChanged; |
337 |
339 |
2158 if ( aPlugin.Occupied() ) |
2160 if ( aPlugin.Occupied() ) |
2159 { |
2161 { |
2160 for ( TInt i = 0; i < aInfos.Count() && !contentInfo; i++ ) |
2162 for ( TInt i = 0; i < aInfos.Count() && !contentInfo; i++ ) |
2161 { |
2163 { |
2162 CHsContentInfo* info = aInfos[i]; |
2164 CHsContentInfo* info = aInfos[i]; |
2163 if ( aPlugin.PluginUid().CompareF( info->Uid() ) == 0 && |
2165 if ( ( !aPlugin.PublisherName().Length() && |
2164 ( ( aPlugin.PublisherName().Length() == 0 ) || |
2166 aPlugin.PluginUid().CompareF( info->Uid() ) == 0 ) || |
2165 ( aPlugin.PublisherName().CompareF( info->PublisherId() ) == 0 ) ) ) |
2167 ( aPlugin.PublisherName().Length() && |
|
2168 aPlugin.PublisherName().CompareF( info->PublisherId() ) == 0 ) |
|
2169 ) |
2166 { |
2170 { |
2167 contentInfo = info->CloneL(); |
2171 contentInfo = info->CloneL(); |
2168 CleanupStack::PushL( contentInfo ); |
2172 CleanupStack::PushL( contentInfo ); |
2169 contentInfo->SetPluginIdL( aPlugin.PluginId() ); |
2173 contentInfo->SetPluginIdL( aPlugin.PluginId() ); |
2170 contentInfo->SetCanBeRemoved( aPlugin.Removable() ); |
2174 contentInfo->SetCanBeRemoved( aPlugin.Removable() ); |