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

List:       kde-commits
Subject:    branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/battery
From:       Laurent Montel <montel () kde ! org>
Date:       2010-09-08 9:43:33
Message-ID: 20100908094333.9DD61AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172962 by mlaurent:

Backport: Change boolean before to return otherwise it will never change.



 M  +2 -2      battery.cpp  


--- branches/KDE/4.5/kdebase/workspace/plasma/generic/applets/battery/battery.cpp #1172961:1172962
@@ -634,15 +634,15 @@
     if (batteryData["Plugged in"].toBool()) {
         const QString state = batteryData["State"].toString();
         if (state == "NoCharge") {
-            return i18n("%1% (charged)", batteryData["Percent"].toString());
             if (chargeChanging) {
                 *chargeChanging = true;
             }
+	    return i18n("%1% (charged)", batteryData["Percent"].toString());
         } else if (state == "Discharging") {
-            return i18n("%1% (discharging)", batteryData["Percent"].toString());
             if (chargeChanging) {
                 *chargeChanging = true;
             }
+            return i18n("%1% (discharging)", batteryData["Percent"].toString());
         }
 
         return i18n("%1% (charging)", batteryData["Percent"].toString());
[prev in list] [next in list] [prev in thread] [next in thread]