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

List:       kde-commits
Subject:    [kdelibs/KDE/4.8] solid/solid/backends/upower: don't consider external batteries (mice, keyboard, BT
From:       Lukas Tinkl <lukas () kde ! org>
Date:       2012-05-29 15:04:29
Message-ID: 20120529150429.B5D9CA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit d1661d1638851fd950c5926fb2040ea2abe2a8f0 by Lukas Tinkl.
Committed on 29/05/2012 at 17:03.
Pushed by lukas into branch 'KDE/4.8'.

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

dantti will test later today

CCBUG: 300787

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

http://commits.kde.org/kdelibs/d1661d1638851fd950c5926fb2040ea2abe2a8f0

diff --git a/solid/solid/backends/upower/upowerbattery.cpp \
b/solid/solid/backends/upower/upowerbattery.cpp index ab555d4..9c5f675 100644
--- a/solid/solid/backends/upower/upowerbattery.cpp
+++ b/solid/solid/backends/upower/upowerbattery.cpp
@@ -44,15 +44,18 @@ 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:
-            result = Solid::Battery::PrimaryBattery;
+            if (powerSupply)
+                result = Solid::Battery::PrimaryBattery;
             break;
         case 3:
-            result = Solid::Battery::UpsBattery;
+            if (powerSupply)
+                result = Solid::Battery::UpsBattery;
             break;
         case 4:
             result = Solid::Battery::MonitorBattery;


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