equal
deleted
inserted
replaced
86 aFSOperationObserver, |
86 aFSOperationObserver, |
87 aFSRequestId, |
87 aFSRequestId, |
88 aSignallingAllowed ), |
88 aSignallingAllowed ), |
89 iDoPlainConnect( aDoPlainConnect ), |
89 iDoPlainConnect( aDoPlainConnect ), |
90 iEventHandler( aEventHandler ), |
90 iEventHandler( aEventHandler ), |
91 iIsSyncStartedSignaled( EFalse ) |
91 iIsSyncStartedSignaled( EFalse ), |
|
92 iAlreadyConnected( EFalse ) |
92 { |
93 { |
93 FUNC_LOG; |
94 FUNC_LOG; |
94 iService = aService; |
95 iService = aService; |
95 } |
96 } |
96 |
97 |
123 if ( tentry.iType.iUid != KUidMsvServiceEntryValue ) |
124 if ( tentry.iType.iUid != KUidMsvServiceEntryValue ) |
124 { |
125 { |
125 User::Panic( KIpsPlgIpsConnPanic, KErrNotSupported ); |
126 User::Panic( KIpsPlgIpsConnPanic, KErrNotSupported ); |
126 } |
127 } |
127 |
128 |
128 iState = EStateStartConnect; |
129 if ( tentry.Connected() ) |
129 iStatus = KRequestPending; |
130 { |
130 SetActive(); |
131 iState = EStateCompleted; |
131 CompleteThis(); |
132 iAlreadyConnected = ETrue; |
|
133 SetActive(); |
|
134 CompleteThis(); |
|
135 } |
|
136 else |
|
137 { |
|
138 iState = EStateStartConnect; |
|
139 iStatus = KRequestPending; |
|
140 SetActive(); |
|
141 CompleteThis(); |
|
142 } |
132 } |
143 } |
133 |
144 |
134 // ---------------------------------------------------------------------------- |
145 // ---------------------------------------------------------------------------- |
135 // CIpsPlgImap4ConnectOp::ProgressL() |
146 // CIpsPlgImap4ConnectOp::ProgressL() |
136 // ---------------------------------------------------------------------------- |
147 // ---------------------------------------------------------------------------- |
519 // CIpsPlgImap4ConnectOp::GetOperationErrorCodeL() |
530 // CIpsPlgImap4ConnectOp::GetOperationErrorCodeL() |
520 // ---------------------------------------------------------------------------- |
531 // ---------------------------------------------------------------------------- |
521 // |
532 // |
522 /*TInt CIpsPlgImap4ConnectOp::GetOperationErrorCodeL( ) |
533 /*TInt CIpsPlgImap4ConnectOp::GetOperationErrorCodeL( ) |
523 { |
534 { |
|
535 if ( iAlreadyConnected ) |
|
536 { |
|
537 // Connected state was set in CIpsPlgPop3ConnectOp::ConstructL() |
|
538 // so iOperation is null |
|
539 return KErrNone; |
|
540 } |
|
541 |
524 if ( !iOperation ) |
542 if ( !iOperation ) |
525 { |
543 { |
526 return KErrNotFound; |
544 return KErrNotFound; |
527 } |
545 } |
528 if ( !iOperation->IsActive() && iOperation->iStatus.Int() != KErrNone ) |
546 if ( !iOperation->IsActive() && iOperation->iStatus.Int() != KErrNone ) |