Bearer Management Integration 2.

2 files changed, 15 insertions, 12 deletions

diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index c8fb3c2..acbee71 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -17,16 +17,12 @@ INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
+
 win32:!wince*:LIBS += -lWs2_32
 wince*:LIBS += -lWs2
 
 CONFIG += console
 
-include(../examples.pri)
-
-macx: {
-    contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
-    contains(CONFIG, debug) {
-     }
-}
+symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 7633dd7..0277d87 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "sessionwidget.h"
+#include "qnetworkconfigmanager.h"
 
 SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *parent)
 :   QWidget(parent)
@@ -79,7 +80,13 @@ void SessionWidget::updateSession()
     updateSessionState(session->state());
     updateSessionError(session->error());
 
-    bearer->setText(session->bearerName());
+    if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint)
+        bearer->setText(session->configuration().bearerName());
+    else {
+        QNetworkConfigurationManager mgr;
+        QNetworkConfiguration c = mgr.configurationFromIdentifier(session->sessionProperty("ActiveConfiguration").toString());
+        bearer->setText(c.bearerName());
+    }
 
     interfaceName->setText(session->interface().humanReadableName());
     interfaceGuid->setText(session->interface().name());
@@ -140,10 +147,10 @@ void SessionWidget::updateSessionState(QNetworkSession::State state)
         s = s.arg(tr("Unknown"));
     }
 
-    if (session->isActive())
-        s = s.arg(tr("Active"));
+    if (session->isOpen())
+        s = s.arg(tr("Open"));
     else
-        s = s.arg(tr("Inactive"));
+        s = s.arg(tr("Closed"));
 
     sessionState->setText(s);
 }