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

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] solid/solid/backends/upower: Revert "don't consider external batteries (mice, keyb
From:       Lukas Tinkl <lukas () kde ! org>
Date:       2012-06-06 13:50:31
Message-ID: 20120606135031.829D6A60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 7f8c750541790de5a380409466cf07cfe19c3651 by Lukas Tinkl.
Committed on 06/06/2012 at 15:47.
Pushed by lukas into branch 'KDE/4.8'.

Revert "don't consider external batteries (mice, keyboard, BT) as primary"

This reverts commit d1661d1638851fd950c5926fb2040ea2abe2a8f0.

This causes more trouble than expected, newer kernels/upower contain a bug that (in \
my case and many others) marks ALL batteries as non-powersupply.

BUG:301033
CCBUG:300787

M  +2    -5    solid/solid/backends/upower/upowerbattery.cpp

http://commits.kde.org/kdelibs/7f8c750541790de5a380409466cf07cfe19c3651

diff --git a/solid/solid/backends/upower/upowerbattery.cpp \
b/solid/solid/backends/upower/upowerbattery.cpp index 9c5f675..ab555d4 100644
--- a/solid/solid/backends/upower/upowerbattery.cpp
+++ b/solid/solid/backends/upower/upowerbattery.cpp
@@ -44,18 +44,15 @@ Solid::Battery::BatteryType Battery::type() const
 {
     Solid::Battery::BatteryType result = Solid::Battery::UnknownBattery;
     const uint t = m_device->prop("Type").toUInt();
-    bool powerSupply = m_device->prop("PowerSupply").toBool();
     switch (t)
     {
         case 1: // TODO "Line Power"
             break;
         case 2:
-            if (powerSupply)
-                result = Solid::Battery::PrimaryBattery;
+            result = Solid::Battery::PrimaryBattery;
             break;
         case 3:
-            if (powerSupply)
-                result = Solid::Battery::UpsBattery;
+            result = Solid::Battery::UpsBattery;
             break;
         case 4:
             result = Solid::Battery::MonitorBattery;


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