equal
deleted
inserted
replaced
283 iState( EIdle ), |
283 iState( EIdle ), |
284 iEntry( NULL ), |
284 iEntry( NULL ), |
285 iPopulateLimit( KIpsPlgPop3PopulateLimitInitValue ), |
285 iPopulateLimit( KIpsPlgPop3PopulateLimitInitValue ), |
286 iForcePopulate( aForcePopulate ), |
286 iForcePopulate( aForcePopulate ), |
287 iSelection( NULL ), |
287 iSelection( NULL ), |
288 iEventHandler( aEventHandler ) |
288 iEventHandler( aEventHandler ), |
|
289 iAlreadyConnected( EFalse ) |
289 { |
290 { |
290 iService = aServiceId; |
291 iService = aServiceId; |
291 } |
292 } |
292 |
293 |
293 // ---------------------------------------------------------------------------- |
294 // ---------------------------------------------------------------------------- |
337 CleanupStack::PopAndDestroy( 2, settings ); |
338 CleanupStack::PopAndDestroy( 2, settings ); |
338 |
339 |
339 if ( tentry.Connected() ) |
340 if ( tentry.Connected() ) |
340 { |
341 { |
341 iState = EConnected; |
342 iState = EConnected; |
|
343 iAlreadyConnected = ETrue; |
342 SetActive(); |
344 SetActive(); |
343 CompleteThis(); |
345 CompleteThis(); |
344 } |
346 } |
345 else |
347 else |
346 { |
348 { |
441 // ---------------------------------------------------------------------------- |
443 // ---------------------------------------------------------------------------- |
442 // |
444 // |
443 TInt CIpsPlgPop3ConnectOp::GetOperationErrorCodeL( ) |
445 TInt CIpsPlgPop3ConnectOp::GetOperationErrorCodeL( ) |
444 { |
446 { |
445 FUNC_LOG; |
447 FUNC_LOG; |
|
448 |
|
449 if ( iAlreadyConnected ) |
|
450 { |
|
451 // Connected state was set in CIpsPlgPop3ConnectOp::ConstructL() |
|
452 // so iOperation is null |
|
453 return KErrNone; |
|
454 } |
|
455 |
446 if ( !iOperation ) |
456 if ( !iOperation ) |
447 { |
457 { |
448 return KErrNotFound; |
458 return KErrNotFound; |
449 } |
459 } |
450 if ( !iOperation->IsActive() && iOperation->iStatus.Int() != KErrNone ) |
460 if ( !iOperation->IsActive() && iOperation->iStatus.Int() != KErrNone ) |