[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [networkmanagement/nm09] /: Also show ad-hoc connections in connection list when either "Show More"
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2012-07-01 0:11:29
Message-ID: 20120701001129.9CCC0A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 71d999c196ccb34edefa2aaa24b26f7e988a984b by Lamarque V. Souza.
Committed on 01/07/2012 at 02:04.
Pushed by lvsouza into branch 'nm09'.

Also show ad-hoc connections in connection list when either "Show More" or
the connection is activated.

BUG: 302790
FIXED-IN: 0.9.0.4

M  +8    -3    applet/activatablelistwidget.cpp
M  +1    -1    libs/service/wirelessnetworkinterfaceactivatableprovider.cpp

http://commits.kde.org/networkmanagement/71d999c196ccb34edefa2aaa24b26f7e988a984b

diff --git a/applet/activatablelistwidget.cpp b/applet/activatablelistwidget.cpp
index 064f207..8226108 100644
--- a/applet/activatablelistwidget.cpp
+++ b/applet/activatablelistwidget.cpp
@@ -157,9 +157,14 @@ bool ActivatableListWidget::accept(RemoteActivatable * \
activatable) const  return false;
         }
     }
-    if (activatable->activatableType() == \
                Knm::Activatable::WirelessInterfaceConnection &&
-        !Solid::Control::NetworkManagerNm09::isWirelessEnabled()) {
-        return false;
+    if (activatable->activatableType() == \
Knm::Activatable::WirelessInterfaceConnection) { +        \
RemoteWirelessInterfaceConnection * wic = \
static_cast<RemoteWirelessInterfaceConnection*>(activatable); +
+        if (!Solid::Control::NetworkManagerNm09::isWirelessEnabled() ||
+            (!m_showAllTypes && !wic->isShared() && wic->operationMode() == \
Solid::Control::WirelessNetworkInterfaceNm09::Adhoc && +                              \
wic->activationState() != Knm::InterfaceConnection::Activated)) { +            return \
false; +        }
     }
     return true;
 }
diff --git a/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp \
b/libs/service/wirelessnetworkinterfaceactivatableprovider.cpp index 885eddf..85611e1 \
                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()) || \
addedConnection->isShared())) { +                if (!ourWicFound && \
(d->environment->networks().contains(wirelessSetting->ssid()) || \
addedConnection->isShared() || wirelessSetting->mode() == \
Knm::WirelessSetting::EnumMode::adhoc)) {  kDebug() << "Adding WIC:" << \
wirelessSetting->ssid() <<  addedConnection->uuid() << addedConnection->name() << \
d->interface->uni() << wirelessSetting->channel();  
                     Knm::WirelessInterfaceConnection * ifaceConnection =


[prev in list] [next in list] [prev in thread] [next in thread]