[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [networkmanagement/nm09] /: More changes to correctly identify
From: Lamarque V. Souza <lamarque () kde ! org>
Date: 2011-12-31 23:12:46
Message-ID: 20111231231246.91516A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 38de4d302751d86faa8dd560705bf80f273ccbe6 by Lamarque V. Souza.
Committed on 01/01/2012 at 00:09.
Pushed by lvsouza into branch 'nm09'.
More changes to correctly identify ad-hoc WPA access points.
M +1 -1 applet/wirelessstatus.cpp
M +1 -1 libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
M +1 -1 plasma_nm_version.h
http://commits.kde.org/networkmanagement/38de4d302751d86faa8dd560705bf80f273ccbe6
diff --git a/applet/wirelessstatus.cpp b/applet/wirelessstatus.cpp
index c81e9b1..6f14264 100644
--- a/applet/wirelessstatus.cpp
+++ b/applet/wirelessstatus.cpp
@@ -67,7 +67,7 @@ public:
//adhoc->setIcon(QIcon("nm-adhoc"));
}
ssid = wobj->ssid();
- Knm::WirelessSecurity::Type best = \
Knm::WirelessSecurity::best(wobj->interfaceCapabilities(), true, \
(wobj->operationMode() == Solid::Control::WirelessNetworkInterfaceNm09::Adhoc), \
wobj->apCapabilities(), wobj->wpaFlags(), wobj->rsnFlags()); + \
Knm::WirelessSecurity::Type best = \
Knm::WirelessSecurity::best(wobj->interfaceCapabilities(), !activatable->isShared(), \
(wobj->operationMode() == Solid::Control::WirelessNetworkInterfaceNm09::Adhoc), \
wobj->apCapabilities(), wobj->wpaFlags(), wobj->rsnFlags());
//security->setToolTip(Knm::WirelessSecurity::shortToolTip(best));
securityIcon = Knm::WirelessSecurity::iconName(best);
securityTooltip = Knm::WirelessSecurity::shortToolTip(best);
diff --git a/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp \
b/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp index b00e017..29b00ab \
100644
--- a/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
+++ b/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
@@ -142,7 +142,7 @@ void \
WirelessNetworkInterfaceActivatableProvider::handleAdd(Knm::Connection * ad }
// create WirelessInterfaceConnections only where the network is \
present
- if (!ourWicFound && \
(d->environment->networks().contains(wirelessSetting->ssid()) || \
wirelessSetting->mode() == Knm::WirelessSetting::EnumMode::adhoc)) { + \
if (!ourWicFound && (d->environment->networks().contains(wirelessSetting->ssid()) || \
addedConnection->isShared())) { kDebug() << "Adding WIC:" << wirelessSetting->ssid() \
<< addedConnection->uuid() << addedConnection->name() << d->interface->uni() << \
wirelessSetting->channel();
Knm::WirelessInterfaceConnection * ifaceConnection =
diff --git a/plasma_nm_version.h b/plasma_nm_version.h
index bf09030..67345af 100644
--- a/plasma_nm_version.h
+++ b/plasma_nm_version.h
@@ -1,4 +1,4 @@
#ifndef PLASMA_NM_VERSION_H
#define PLASMA_NM_VERSION_H
-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111227)";
+static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111231)";
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic