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

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/workspace
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2009-08-11 15:06:29
Message-ID: 1250003189.090079.13270.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1010069 by wstephens:

Merge
r1010068 - robustness fixes in backend
r1010067 - enum misspecification


 M  +1 -2      libs/solid/control/wirelessnetworkinterface.h  
 M  +14 -12    solid/networkmanager-0.7/accesspoint.cpp  
 M  +8 -2      solid/networkmanager-0.7/wirelessnetworkinterface.cpp  
 M  +1 -1      solid/networkmanager-0.7/wirelessnetworkinterface.h  


--- branches/KDE/4.3/kdebase/workspace/libs/solid/control/wirelessnetworkinterface.h \
#1010068:1010069 @@ -50,8 +50,7 @@
     public:
         enum OperationMode { Unassociated, Adhoc, Managed, Master, Repeater };
         // corresponding to 802.11 capabilities defined in NetworkManager.h
-        enum Capability { NoCapability = 0x0, Wep40 = 0x2, Wep104, Tkip = 0x4, Ccmp \
                = 0x8, Wpa = 0x10,
-                          Rsn };
+        enum Capability { NoCapability = 0x0, Wep40 = 0x2, Wep104, Tkip = 0x4, Ccmp \
= 0x8, Wpa = 0x10, Rsn = 0x20 };  Q_DECLARE_FLAGS(Capabilities, Capability)
 
         /**
--- branches/KDE/4.3/kdebase/workspace/solid/networkmanager-0.7/accesspoint.cpp \
#1010068:1010069 @@ -49,19 +49,21 @@
 NMAccessPoint::NMAccessPoint( const QString& path, QObject * parent ) : \
Solid::Control::Ifaces::AccessPoint(parent), d(new Private( path ))  {
     d->uni = path;
-    d->capabilities = convertCapabilities( d->iface.flags() );
-    d->wpaFlags = convertWpaFlags( d->iface.wpaFlags() );
-    d->rsnFlags = convertWpaFlags( d->iface.rsnFlags() );
-    d->signalStrength = d->iface.strength();
-    d->ssid = d->iface.ssid();
-    d->rawSsid = d->iface.ssid();
-    d->frequency = d->iface.frequency();
-    d->hardwareAddress = d->iface.hwAddress();
-    d->maxBitRate = d->iface.maxBitrate();
-    // make this a static on WirelessNetworkInterface
-    d->mode = NMWirelessNetworkInterface::convertOperationMode(d->iface.mode());
-    connect( &d->iface, SIGNAL(PropertiesChanged(const QVariantMap &)),
+    if (d->iface.isValid()) {
+        d->capabilities = convertCapabilities( d->iface.flags() );
+        d->wpaFlags = convertWpaFlags( d->iface.wpaFlags() );
+        d->rsnFlags = convertWpaFlags( d->iface.rsnFlags() );
+        d->signalStrength = d->iface.strength();
+        d->ssid = d->iface.ssid();
+        d->rawSsid = d->iface.ssid();
+        d->frequency = d->iface.frequency();
+        d->hardwareAddress = d->iface.hwAddress();
+        d->maxBitRate = d->iface.maxBitrate();
+        // make this a static on WirelessNetworkInterface
+        d->mode = NMWirelessNetworkInterface::convertOperationMode(d->iface.mode());
+        connect( &d->iface, SIGNAL(PropertiesChanged(const QVariantMap &)),
                 this, SLOT(propertiesChanged(const QVariantMap &)));
+    }
 }
 
 NMAccessPoint::~NMAccessPoint()
--- branches/KDE/4.3/kdebase/workspace/solid/networkmanager-0.7/wirelessnetworkinterface.cpp \
#1010068:1010069 @@ -82,7 +82,7 @@
 
 }
 
-MacAddressList NMWirelessNetworkInterface::accessPoints() const
+QStringList NMWirelessNetworkInterface::accessPoints() const
 {
     Q_D(const NMWirelessNetworkInterface);
     return d->accessPoints;
@@ -120,7 +120,13 @@
 
 QObject * NMWirelessNetworkInterface::createAccessPoint(const QString & uni)
 {
-    return new NMAccessPoint(uni, 0);
+    Q_D(NMWirelessNetworkInterface);
+    NMAccessPoint * ap = 0;
+    if (d->accessPoints.contains(uni)) {
+        ap = new NMAccessPoint(uni, 0);
+    }
+
+    return ap;
 }
 
 void NMWirelessNetworkInterface::wirelessPropertiesChanged(const QVariantMap & \
                changedProperties)
--- branches/KDE/4.3/kdebase/workspace/solid/networkmanager-0.7/wirelessnetworkinterface.h \
#1010068:1010069 @@ -41,7 +41,7 @@
 public:
     NMWirelessNetworkInterface(const QString & path, NMNetworkManager * manager, \
QObject * parent);  ~NMWirelessNetworkInterface();
-    MacAddressList accessPoints() const;
+    QStringList accessPoints() const;
     QString activeAccessPoint() const;
     QString hardwareAddress() const;
     Solid::Control::WirelessNetworkInterface::OperationMode mode() const;


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