Git commit 71b323190660fc0474ce7acf2ece4fe320d83514 by Lamarque V. Souza.
Committed on 01/01/2012 at 00:09.
Pushed by lvsouza into branch 'master'.

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/71b323190660fc0474ce7acf2ece4fe320=
d83514

diff --git a/applet/wirelessstatus.cpp b/applet/wirelessstatus.cpp
index 6d41d7e..bcd133b 100644
--- a/applet/wirelessstatus.cpp
+++ b/applet/wirelessstatus.cpp
@@ -66,7 +66,7 @@ public:
             //adhoc->setIcon(QIcon("nm-adhoc"));
         }
         ssid =3D wobj->ssid();
-        Knm::WirelessSecurity::Type best =3D Knm::WirelessSecurity::best(w=
obj->interfaceCapabilities(), true, (wobj->operationMode() =3D=3D NetworkMa=
nager::WirelessDevice::Adhoc), wobj->apCapabilities(), wobj->wpaFlags(), wo=
bj->rsnFlags());
+        Knm::WirelessSecurity::Type best =3D Knm::WirelessSecurity::best(w=
obj->interfaceCapabilities(), !activatable->isShared(), (wobj->operationMod=
e() =3D=3D NetworkManager::WirelessDevice::Adhoc), wobj->apCapabilities(), =
wobj->wpaFlags(), wobj->rsnFlags());
         //security->setToolTip(Knm::WirelessSecurity::shortToolTip(best));
         securityIcon =3D Knm::WirelessSecurity::iconName(best);
         securityTooltip =3D Knm::WirelessSecurity::shortToolTip(best);
diff --git a/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp b=
/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
index 4258856..64cbc84 100644
--- a/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
+++ b/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp
@@ -142,7 +142,7 @@ void WirelessNetworkInterfaceActivatableProvider::handl=
eAdd(Knm::Connection * ad
                 }
 =

                 // create WirelessInterfaceConnections only where the netw=
ork is present
-                if (!ourWicFound && (d->environment->networks().contains(w=
irelessSetting->ssid()) || wirelessSetting->mode() =3D=3D Knm::WirelessSett=
ing::EnumMode::adhoc)) {
+                if (!ourWicFound && (d->environment->networks().contains(w=
irelessSetting->ssid()) || addedConnection->isShared())) {
                     kDebug() << "Adding WIC:" << wirelessSetting->ssid() <=
<  addedConnection->uuid() << addedConnection->name() << d->interface->uni(=
) << wirelessSetting->channel();
 =

                     Knm::WirelessInterfaceConnection * ifaceConnection =3D
diff --git a/plasma_nm_version.h b/plasma_nm_version.h
index 9c4fb46..5a62e1e 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 =3D "0.9.1_rc1 (master 20111230)";
+static const char * plasmaNmVersion =3D "0.9.1_rc1 (master 20111231)";
 #endif