Branch: master

066f3174 2014-12-05 13:37:07 Timothy Pearson
Fix detection of laptop AC adapters
M tdecore/tdehw/tdehardwaredevices.cpp
M tdecore/tdehw/tdehardwaredevices.h
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 48fce75..7ddd46d 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the TDE libraries
-   Copyright (C) 2012 Timothy Pearson <kb9vqf@...>
+   Copyright (C) 2012-2014 Timothy Pearson <kb9vqf@...>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -2185,7 +2185,8 @@
 		}
 		if (devicesubsystem == "power_supply") {
 			TQString powersupplyname(udev_device_get_property_value(dev, "POWER_SUPPLY_NAME"));
-			if (powersupplyname.upper().startsWith("AC")) {
+			if ((devicedriver == "ac")
+				|| (powersupplyname.upper().startsWith("AC"))) {
 				if (!device) device = new TDEMainsPowerDevice(TDEGenericDeviceType::PowerSupply);
 			}
 			else {
diff --git a/tdecore/tdehw/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h
index 594057b..6592b8b 100644
--- a/tdecore/tdehw/tdehardwaredevices.h
+++ b/tdecore/tdehw/tdehardwaredevices.h
@@ -1,5 +1,5 @@
 /* This file is part of the TDE libraries
-   Copyright (C) 2012 Timothy Pearson <kb9vqf@...>
+   Copyright (C) 2012-2014 Timothy Pearson <kb9vqf@...>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public