summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-07 02:39:13 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-07 02:39:13 -0500
commit47c56ecaf41ff1ed7fcf7447a0270e5b585f1716 (patch)
tree4bcebc899b6929b3fcbbb5b39092a8c2f89533a3
parentd6816283be06ec485549a312e04c8c61fca30da4 (diff)
downloadtdelibs-47c56ecaf41ff1ed7fcf7447a0270e5b585f1716.tar.gz
tdelibs-47c56ecaf41ff1ed7fcf7447a0270e5b585f1716.zip
Fix network manager interface not returning active connections
Add unclassified TI FlashMedia device
-rw-r--r--tdecore/networkbackends/network-manager/network-manager.cpp4
-rw-r--r--tdecore/tdehardwaredevices.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp
index f29d7832c..ac07b8a1a 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/networkbackends/network-manager/network-manager.cpp
@@ -1909,7 +1909,7 @@ TDENetworkDeviceInformation TDENetworkConnectionManager_BackendNM::deviceInforma
DBus::ActiveConnectionProxy activeConnection(NM_DBUS_SERVICE, connectionPath);
activeConnection.setConnection(TQT_DBusConnection::systemBus());
ret.activeConnectionUUID = activeConnection.getUuid(error);
- if (!error.isValid()) {
+ if (error.isValid()) {
ret.activeConnectionUUID = TQString::null;
}
}
@@ -1934,7 +1934,7 @@ TDENetworkDeviceInformation TDENetworkConnectionManager_BackendNM::deviceStatus(
DBus::ActiveConnectionProxy activeConnection(NM_DBUS_SERVICE, connectionPath);
activeConnection.setConnection(TQT_DBusConnection::systemBus());
ret.activeConnectionUUID = activeConnection.getUuid(error);
- if (!error.isValid()) {
+ if (error.isValid()) {
ret.activeConnectionUUID = TQString::null;
}
}
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 49736d649..f7f90664d 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -3907,6 +3907,9 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform);
}
}
+ if (devicesubsystem == "tifm_adapter") {
+ if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::StorageController);
+ }
if (devicesubsystem == "mmc_host") {
if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::StorageController);
}