equal
deleted
inserted
replaced
229 if (iEngine && iWidgetUiObserver) |
229 if (iEngine && iWidgetUiObserver) |
230 { |
230 { |
231 iEngine->RemoveLoadEventObserver( iWidgetUiObserver ); |
231 iEngine->RemoveLoadEventObserver( iWidgetUiObserver ); |
232 iEngine->RemoveStateChangeObserver( iWindowManager.View() ); |
232 iEngine->RemoveStateChangeObserver( iWindowManager.View() ); |
233 } |
233 } |
|
234 #ifdef BRDO_OCC_ENABLED_FF |
|
235 if ( iRetryConnectivity) |
|
236 { |
|
237 iRetryConnectivity->Cancel(); |
|
238 delete iRetryConnectivity; |
|
239 iRetryConnectivity = NULL; |
|
240 } |
|
241 #endif |
234 delete iEngine; |
242 delete iEngine; |
235 delete iWidgetUiObserver; |
243 delete iWidgetUiObserver; |
236 delete iUrl; |
244 delete iUrl; |
237 delete iWidgetPath; |
245 delete iWidgetPath; |
238 delete iWidgetBundleId; |
246 delete iWidgetBundleId; |
929 // or hit cancel altogether in which case the KErrCancel block above |
937 // or hit cancel altogether in which case the KErrCancel block above |
930 // kicks in and sets a EDeny. |
938 // kicks in and sets a EDeny. |
931 User::Leave( connFailure ); |
939 User::Leave( connFailure ); |
932 } |
940 } |
933 *aNewConn = ETrue; |
941 *aNewConn = ETrue; |
934 |
942 if(iWindowManager.GetNetworkMode() == EOfflineMode) |
|
943 { |
|
944 iWindowManager.GetConnection()->CancelConnection(); |
|
945 iWindowManager.GetConnection()->StopConnectionL(); |
|
946 } |
935 #ifdef BRDO_OCC_ENABLED_FF |
947 #ifdef BRDO_OCC_ENABLED_FF |
936 TRAP_IGNORE(ConnNeededStatusL(KErrNone)); |
948 else |
|
949 TRAP_IGNORE(ConnNeededStatusL(KErrNone)); |
937 #endif |
950 #endif |
938 } |
951 } |
939 } |
952 } |
940 |
953 |
941 // ----------------------------------------------------------------------------- |
954 // ----------------------------------------------------------------------------- |
1341 if( iRetryConnectivity && iRetryConnectivity->IsActive()) |
1354 if( iRetryConnectivity && iRetryConnectivity->IsActive()) |
1342 { |
1355 { |
1343 iRetryConnectivity->Cancel(); |
1356 iRetryConnectivity->Cancel(); |
1344 } |
1357 } |
1345 iRetryConnectivity->Start(KRetryConnectivityTimeout, 0,TCallBack(RetryConnectivity,this)); |
1358 iRetryConnectivity->Start(KRetryConnectivityTimeout, 0,TCallBack(RetryConnectivity,this)); |
|
1359 } |
|
1360 else |
|
1361 { |
|
1362 TRAP_IGNORE( Engine()->HandleCommandL( (TInt)TBrCtlDefs::ECommandCancelFetch + (TInt)TBrCtlDefs::ECommandIdBase ) ); |
1346 } |
1363 } |
1347 } |
1364 } |
1348 |
1365 |
1349 void CWidgetUiWindow::ConnNeededStatusL( TInt aErr ) |
1366 void CWidgetUiWindow::ConnNeededStatusL( TInt aErr ) |
1350 { |
1367 { |