diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-20 05:35:29 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-20 07:02:46 (GMT) |
commit | c4c75ebd65454fd27bffefb4a3468ece20990c86 (patch) | |
tree | 3cf53f960be45c31005371a602fe297671c994a5 /src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | |
parent | b64a309f78b684bf3acb49bc6d0e9b93aa2138c5 (diff) | |
download | Qt-c4c75ebd65454fd27bffefb4a3468ece20990c86.zip Qt-c4c75ebd65454fd27bffefb4a3468ece20990c86.tar.gz Qt-c4c75ebd65454fd27bffefb4a3468ece20990c86.tar.bz2 |
Remove redundant network configuration updates on startup.
The initial list of network configurations was being fetched twice when
the bearer management plugins are loaded.
Diffstat (limited to 'src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp')
-rw-r--r-- | src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index 13b2252..3ebc356 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -93,16 +93,16 @@ QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent) userSettings->setConnections(); connect(userSettings, SIGNAL(newConnection(QDBusObjectPath)), this, SLOT(newConnection(QDBusObjectPath))); - - QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection); } QNetworkManagerEngine::~QNetworkManagerEngine() { } -void QNetworkManagerEngine::init() +void QNetworkManagerEngine::initialize() { + QMutexLocker locker(&mutex); + // Get current list of access points. foreach (const QDBusObjectPath &devicePath, interface->getDevices()) deviceAdded(devicePath); |