Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed compilerwarnings regression in public headers.
  Fix duplicate definition error
  Fix namespace error
  Fix the broken QPixmap::fromSymbianRSgImage().
  Fix native child window Symbian decoration handling.
  Fixed "not a valid preprocessing token" on GCCE.
  Avoided the Linux version of the --no-undefined switch.
  Added missing edllstub.lib for GCCE.
  symbian/linux-gcce: Use -u _E32Dll when linking DLLs
  Revert "Implement Symbian support for enable_backup CONFIG value"
  Implement Symbian support for enable_backup CONFIG value
  Fix deployment issues with networkselftest
  Fix random crashes when bearer suddenly goes down
  Fixed a bug where the softkeys would leave a see-through "hole".

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 433eef6..741f8c5 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1552,8 +1552,8 @@ void ConnectionProgressNotifier::StartNotifications()
 {
     if (!IsActive()) {
         SetActive();
+        iConnection.ProgressNotification(iProgress, iStatus);
     }
-    iConnection.ProgressNotification(iProgress, iStatus);
 }
 
 void ConnectionProgressNotifier::StopNotifications()
@@ -1569,10 +1569,10 @@ void ConnectionProgressNotifier::DoCancel()
 void ConnectionProgressNotifier::RunL()
 {
     if (iStatus == KErrNone) {
-        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
-    
         SetActive();
         iConnection.ProgressNotification(iProgress, iStatus);
+        // warning, this object may be deleted in the callback - do nothing after handleSymbianConnectionStatusChange
+        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
     }
 }