[Goodies-commits] r5774 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-23 11:37:00 +0000 (Thu, 23 Oct 2008)
New Revision: 5774

Modified:
   xfce4-power-manager/trunk/src/xfpm-battery-icon.c
Log:
correct critical warning for kbd and mouse batteries

Modified: xfce4-power-manager/trunk/src/xfpm-battery-icon.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery-icon.c	2008-10-23 10:27:14 UTC (rev 5773)
+++ xfce4-power-manager/trunk/src/xfpm-battery-icon.c	2008-10-23 11:37:00 UTC (rev 5774)
@@ -456,7 +456,7 @@
 {
     g_return_if_fail(XFPM_IS_BATTERY_ICON(battery_icon));
     battery_icon->battery_present = ac_adapter_present;
-    
+    guint critical_level = battery_icon->type == PRIMARY || UPS ? battery_icon->critical_level : 5;
 #ifdef DEBUG
     gchar *content_is_charging;
     gchar *content_is_discharging;
@@ -526,7 +526,7 @@
     // battery is discharging
     if ( is_charging == FALSE && is_discharging == TRUE )
     {
-        if ( remaining_per > ( battery_icon->critical_level + 10 ) )
+        if ( remaining_per > ( critical_level + 10 ) )
         {
             if ( !ac_adapter_present )
             {
@@ -539,12 +539,12 @@
             }
             xfpm_battery_icon_update(battery_icon,DISCHARGING,remaining_per,ac_adapter_present);
         } 
-        else if ( remaining_per <= ( battery_icon->critical_level+10 ) && remaining_per > battery_icon->critical_level )
+        else if ( remaining_per <= ( critical_level+10 ) && remaining_per > critical_level )
         {
             strcat(tip,_(" Battery charge level is low"));
             xfpm_battery_icon_update(battery_icon,LOW,remaining_per,ac_adapter_present);
         }
-        else if ( remaining_per <= battery_icon->critical_level )
+        else if ( remaining_per <= critical_level )
         {
             strcat(tip,_(" Battery charge level is critical"));
             xfpm_battery_icon_update(battery_icon,CRITICAL,remaining_per,ac_adapter_present);