diff -r e2d33e235f7e -r 885c2596c964 qtmobility/src/bearer/qnetworksession_s60_p.h --- a/qtmobility/src/bearer/qnetworksession_s60_p.h Thu Jul 15 19:34:35 2010 +0300 +++ b/qtmobility/src/bearer/qnetworksession_s60_p.h Thu Aug 19 10:43:30 2010 +0300 @@ -64,7 +64,7 @@ #ifdef SNAP_FUNCTIONALITY_AVAILABLE #include #endif -#ifdef OCC_FUNCTIONALITY_AVAILABLE +#if defined(OCC_FUNCTIONALITY_AVAILABLE) && defined(SNAP_FUNCTIONALITY_AVAILABLE) #include #endif @@ -132,6 +132,7 @@ private Q_SLOTS: void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState); void configurationRemoved(const QNetworkConfiguration& config); + void configurationAdded(const QNetworkConfiguration& config); private: TUint iapClientCount(TUint aIAPId) const; @@ -175,7 +176,6 @@ bool iFirstSync; bool iStoppedByUser; bool iClosedByUser; - TUint32 iDeprecatedConnectionId; #ifdef SNAP_FUNCTIONALITY_AVAILABLE CActiveCommsMobilityApiExt* iMobility; @@ -191,6 +191,8 @@ TUint32 iOldRoamingIap; TUint32 iNewRoamingIap; + bool isOpening; + friend class QNetworkSession; friend class ConnectionProgressNotifier; };