Merge branch 4.7 into qt-4.8-from-4.7

2 files changed, 14 insertions, 9 deletions

diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index 04edbb7..38ae0c8 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -104,15 +104,7 @@ void SymbianEngine::initialize()
         return;
     }
 
-    TRAP(error, {
-        iConnectionMonitor.ConnectL();
-        CleanupClosePushL(iConnectionMonitor);
-#ifdef SNAP_FUNCTIONALITY_AVAILABLE
-        User::LeaveIfError(iConnectionMonitor.SetUintAttribute(EBearerIdAll, 0, KBearerGroupThreshold, 1));
-#endif
-        iConnectionMonitor.NotifyEventL(*this);
-        CleanupStack::Pop();
-    });
+    TRAP(error, StartConnectionMonitorNotifyL());
     if (error != KErrNone) {
         iInitOk = false;
         return;
@@ -148,6 +140,17 @@ void SymbianEngine::initialize()
     startCommsDatabaseNotifications();
 }
 
+void SymbianEngine::StartConnectionMonitorNotifyL()
+{
+    iConnectionMonitor.ConnectL();
+    CleanupClosePushL(iConnectionMonitor);
+#ifdef SNAP_FUNCTIONALITY_AVAILABLE
+    User::LeaveIfError(iConnectionMonitor.SetUintAttribute(EBearerIdAll, 0, KBearerGroupThreshold, 1));
+#endif
+    iConnectionMonitor.NotifyEventL(*this);
+    CleanupStack::Pop();
+}
+
 SymbianEngine::~SymbianEngine()
 {
     Cancel();
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 3b3a78a..7455d25 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -184,6 +184,8 @@ private:
     void startMonitoringIAPData(TUint32 aIapId);
     QNetworkConfigurationPrivatePointer dataByConnectionId(TUint aConnectionId);
 
+    void StartConnectionMonitorNotifyL();
+
 protected:
     // From CActive
     void RunL();