equal
deleted
inserted
replaced
306 ( EConnMonDeleteConnection == aConnMonEvent.EventType() ) |
306 ( EConnMonDeleteConnection == aConnMonEvent.EventType() ) |
307 && ( connId == aConnMonEvent.ConnectionId() ) ) |
307 && ( connId == aConnMonEvent.ConnectionId() ) ) |
308 { |
308 { |
309 // notifier will finish, so cancel all other notifications |
309 // notifier will finish, so cancel all other notifications |
310 iMonitor.CancelNotifications(); |
310 iMonitor.CancelNotifications(); |
311 SelectedConnectionClosedL(); |
311 |
312 |
312 // Bring back the 3s delay to avoid possible problems. |
|
313 // (GPRS Detach and Attach overlapping, when only 1 context allowed, |
|
314 // causing 15s delay.) |
|
315 User::After( CAknNoteDialog::ELongTimeout ); |
|
316 |
313 iDisconnectDialogUi->CompleteL( KErrNone ); |
317 iDisconnectDialogUi->CompleteL( KErrNone ); |
314 } |
318 } |
315 else if( iDisconnectDialogUi && |
319 else if( iDisconnectDialogUi && |
316 ( EConnMonDeleteConnection == aConnMonEvent.EventType() ) ) |
320 ( EConnMonDeleteConnection == aConnMonEvent.EventType() ) ) |
317 { |
321 { |
346 return iConnArray; |
350 return iConnArray; |
347 } |
351 } |
348 |
352 |
349 |
353 |
350 // --------------------------------------------------------- |
354 // --------------------------------------------------------- |
351 // CConnectionModel::SelectedConnectionClosedL |
|
352 // --------------------------------------------------------- |
|
353 // |
|
354 void CConnectionModel::SelectedConnectionClosedL() |
|
355 { |
|
356 CLOG_ENTERFN("CConnectionModel::SelectedConnectionClosedL"); |
|
357 |
|
358 // the connection is succesfully closed |
|
359 CConnectionInfo* info = iConnArray->At( iClosingConnectionIndex ); |
|
360 |
|
361 CLOG_LEAVEFN("CConnectionModel::SelectedConnectionClosedL"); |
|
362 } |
|
363 |
|
364 |
|
365 // --------------------------------------------------------- |
|
366 // CDisconnectDlgDialog::InfoNoteL |
355 // CDisconnectDlgDialog::InfoNoteL |
367 // --------------------------------------------------------- |
356 // --------------------------------------------------------- |
368 // |
357 // |
369 void CConnectionModel::InfoNoteL( const TInt aPromptResourceId, |
358 void CConnectionModel::InfoNoteL( const TInt aPromptResourceId, |
370 const TDesC* aPrompt ) |
359 const TDesC* aPrompt ) |