diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-28 13:05:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-28 13:05:30 -0600 |
| commit | 2277bfa0d62d052c5a1fa42425ed6ed23d1cc96d (patch) | |
| tree | e83eb16a6bb2aef0b7a0b9ccef739825a408a166 /tdecore/tdehardwaredevices.cpp | |
| parent | 360d9e3c4a704503f52f2ec43249fee0a6dc4084 (diff) | |
| download | tdelibs-2277bfa0d62d052c5a1fa42425ed6ed23d1cc96d.tar.gz tdelibs-2277bfa0d62d052c5a1fa42425ed6ed23d1cc96d.zip | |
Fix a number of issues with the network-manager backend, including event loop recursion
Diffstat (limited to 'tdecore/tdehardwaredevices.cpp')
| -rw-r--r-- | tdecore/tdehardwaredevices.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index d4a10c340..e143e00d5 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -2724,7 +2724,7 @@ TDEGenericDeviceType::TDEGenericDeviceType readGenericDeviceTypeFromString(TQStr else if (query == "ThermalControl") { ret = TDEGenericDeviceType::ThermalControl; } - else if (query == "BlueTooth") { + else if (query == "Bluetooth") { ret = TDEGenericDeviceType::BlueTooth; } else if (query == "Bridge") { @@ -3215,6 +3215,11 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD )) { if (!device) device = new TDEStorageDevice(TDEGenericDeviceType::Disk); } + else if (devicetype == "host") { + if (devicesubsystem == "bluetooth") { + if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::BlueTooth); + } + } else if (devicetype.isNull()) { if (devicesubsystem == "acpi") { // If the ACPI device exposes a system path ending in /PNPxxxx:yy, the device type can be precisely determined @@ -3265,9 +3270,6 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::TextIO); } } - else if (devicesubsystem == "bluetooth") { - if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::BlueTooth); - } else if (devicesubsystem == "usb-serial") { if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Serial); } @@ -5288,7 +5290,7 @@ TQString TDEHardwareDevices::getFriendlyDeviceTypeStringFromType(TDEGenericDevic ret = i18n("Thermal Control"); } else if (query == TDEGenericDeviceType::BlueTooth) { - ret = i18n("BlueTooth"); + ret = i18n("Bluetooth"); } else if (query == TDEGenericDeviceType::Bridge) { ret = i18n("Bridge"); |