From 2666e68f49c4a8185de796438fd3f672fcec0365 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 28 May 2010 09:30:54 +1000
Subject: Fix up cancelling of active object.

Task-number: QTBUG-10296
---
 src/plugins/bearer/symbian/symbianengine.cpp | 78 ++++++++++++----------------
 1 file changed, 34 insertions(+), 44 deletions(-)

diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index ed6aee6..bc93d0e 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -899,15 +899,7 @@ void SymbianEngine::stopCommsDatabaseNotifications()
 
     if (iWaitingCommsDatabaseNotifications) {
         iWaitingCommsDatabaseNotifications = EFalse;
-        if (!IsActive()) {
-            SetActive();
-            // Make sure that notifier recorded events will not be returned
-            // as soon as the client issues the next RequestNotification() request.
-            ipCommsDB->RequestNotification(iStatus);
-            ipCommsDB->CancelRequestNotification();
-        } else {
-            ipCommsDB->CancelRequestNotification();
-        }
+        Cancel();
     }
 }
 
@@ -922,46 +914,44 @@ void SymbianEngine::RunL()
         return;
     }
 
-    if (iStatus != KErrCancel) {
-        RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int());
+    RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int());
 
-        switch (event) {
-        case RDbNotifier::EUnlock:   /** All read locks have been removed.  */
-        case RDbNotifier::ECommit:   /** A transaction has been committed.  */ 
-        case RDbNotifier::ERollback: /** A transaction has been rolled back */
-        case RDbNotifier::ERecover:  /** The database has been recovered    */
+    switch (event) {
+    case RDbNotifier::EUnlock:   /** All read locks have been removed.  */
+    case RDbNotifier::ECommit:   /** A transaction has been committed.  */
+    case RDbNotifier::ERollback: /** A transaction has been rolled back */
+    case RDbNotifier::ERecover:  /** The database has been recovered    */
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
-            qDebug("QNCM CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
+        qDebug("QNCM CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
 #endif
-            iIgnoringUpdates = true;
-            // Other events than ECommit get lower priority. In practice with those events,
-            // we delay_before_updating methods, whereas
-            // with ECommit we _update_before_delaying the reaction to next event.
-            // Few important notes: 1) listening to only ECommit does not seem to be adequate,
-            // but updates will be missed. Hence other events are reacted upon too.
-            // 2) RDbNotifier records the most significant event, and that will be returned once
-            // we issue new RequestNotification, and hence updates will not be missed even
-            // when we are 'not reacting to them' for few seconds.
-            if (event == RDbNotifier::ECommit) {
-                TRAPD(error, updateConfigurationsL());
-                if (error == KErrNone) {
-                    updateStatesToSnaps();
-                }
-                waitRandomTime();
-            } else {
-                waitRandomTime();
-                TRAPD(error, updateConfigurationsL());
-                if (error == KErrNone) {
-                    updateStatesToSnaps();
-                }   
+        iIgnoringUpdates = true;
+        // Other events than ECommit get lower priority. In practice with those events,
+        // we delay_before_updating methods, whereas
+        // with ECommit we _update_before_delaying the reaction to next event.
+        // Few important notes: 1) listening to only ECommit does not seem to be adequate,
+        // but updates will be missed. Hence other events are reacted upon too.
+        // 2) RDbNotifier records the most significant event, and that will be returned once
+        // we issue new RequestNotification, and hence updates will not be missed even
+        // when we are 'not reacting to them' for few seconds.
+        if (event == RDbNotifier::ECommit) {
+            TRAPD(error, updateConfigurationsL());
+            if (error == KErrNone) {
+                updateStatesToSnaps();
+            }
+            waitRandomTime();
+        } else {
+            waitRandomTime();
+            TRAPD(error, updateConfigurationsL());
+            if (error == KErrNone) {
+                updateStatesToSnaps();
             }
-            iIgnoringUpdates = false; // Wait time done, allow updating again
-            iWaitingCommsDatabaseNotifications = true;
-            break;
-        default:
-            // Do nothing
-            break;
         }
+        iIgnoringUpdates = false; // Wait time done, allow updating again
+        iWaitingCommsDatabaseNotifications = true;
+        break;
+    default:
+        // Do nothing
+        break;
     }
 
     if (iWaitingCommsDatabaseNotifications) {
-- 
cgit v0.12