--- a/examples/bearermonitor/sessionwidget.cpp Fri Sep 17 08:34:34 2010 +0300
+++ b/examples/bearermonitor/sessionwidget.cpp Mon Oct 04 01:37:06 2010 +0300
@@ -89,14 +89,27 @@
{
updateSessionState(session->state());
- 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());
+ QNetworkConfigurationManager manager;
+ QNetworkConfiguration config;
+ switch (session->configuration().type()) {
+ case QNetworkConfiguration::InternetAccessPoint:
+ config = session->configuration();
+ break;
+ case QNetworkConfiguration::ServiceNetwork:
+ config = manager.configurationFromIdentifier(
+ session->sessionProperty("ActiveConfiguration").toString());
+ break;
+ case QNetworkConfiguration::UserChoice:
+ config = manager.configurationFromIdentifier(
+ session->sessionProperty("UserChoiceConfiguration").toString());
+ break;
+ default:
+ ;
}
+ bearer->setText(config.bearerName());
+ configuration->setText(config.name());
+
interfaceName->setText(session->interface().humanReadableName());
interfaceGuid->setText(session->interface().name());
}