Commit 0e87ab1a authored by Lamarque Souza's avatar Lamarque Souza
Browse files

Revert "Test if DBus interface object is valid before using it."

1240c6f6 does not prevent the crash it
is was supposed to fix.

This reverts commit 1240c6f6.

CCBUG: 283241
parent ca9444a9
......@@ -59,15 +59,8 @@ public:
void init(RemoteWirelessObject* wobj)
{
if (!wobj) {
kDebug() << "wobj is null";
if (!wobj)
return;
}
if (!wobj->isValid()) {
kDebug() << "wobj is invalid";
return;
}
if (wobj->operationMode() == Solid::Control::WirelessNetworkInterfaceNm09::Adhoc) {
adhoc = true;
......
......@@ -81,9 +81,4 @@ Solid::Control::WirelessNetworkInterfaceNm09::OperationMode RemoteWirelessInterf
return (Solid::Control::WirelessNetworkInterfaceNm09::OperationMode)rsnflags;
}
bool RemoteWirelessInterfaceConnection::isValid() const
{
Q_D(const RemoteWirelessInterfaceConnection);
return d->wirelessInterfaceConnectionIface->isValid();
}
// vim: sw=4 sts=4 et tw=100
......@@ -53,7 +53,6 @@ public:
Solid::Control::AccessPointNm09::WpaFlags wpaFlags() const;
Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const;
Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const;
bool isValid() const;
Q_SIGNALS:
void strengthChanged(int);
protected:
......
......@@ -84,10 +84,4 @@ Solid::Control::WirelessNetworkInterfaceNm09::OperationMode RemoteWirelessNetwor
return (Solid::Control::WirelessNetworkInterfaceNm09::OperationMode)rsnflags;
}
bool RemoteWirelessNetwork::isValid() const
{
Q_D(const RemoteWirelessNetwork);
return d->wirelessNetworkItemInterface->isValid();
}
// vim: sw=4 sts=4 et tw=100
......@@ -54,7 +54,6 @@ public:
Solid::Control::AccessPointNm09::WpaFlags wpaFlags() const;
Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const;
Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const;
bool isValid() const;
Q_SIGNALS:
void strengthChanged(int);
protected:
......
......@@ -36,7 +36,6 @@ public:
virtual Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const = 0;
virtual Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const = 0;
virtual void strengthChanged(int) = 0;
virtual bool isValid() const = 0;
};
#endif // REMOTEWIRELESSOBJECT_H
#ifndef PLASMA_NM_VERSION_H
#define PLASMA_NM_VERSION_H
static const char * plasmaNmVersion = "0.9.0_rc2 (nm09 20111103)";
static const char * plasmaNmVersion = "0.9.0_rc2 (nm09 20111107)";
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment