enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

alert popup wrong - if time_left < 0 then its unknown and shouldnt be used. 

SVN revision: 37685
This commit is contained in:
Carsten Haitzler 2008-11-17 03:42:21 +00:00
parent 789102ec2e
commit c646bbdc51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/battery/e_mod_main.c
View File

@ -330,6 +330,9 @@ _battery_hal_update(void)
}
if (batnum > 0) full /= batnum;
printf("full = %i, time_left = %i, have_battery = %i, have_power = %i\n",
full, time_left, have_battery, have_power);
if ((disch == 0) && (chrg == 0)) time_left = -1;
if (time_left < 1) time_left = -1;
@ -345,7 +348,6 @@ _battery_hal_shutdown(void)
conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
if (!conn) return;
// FIXME: free all bat/ac adapters, cattery_config stuff etc.
if (battery_config->hal.have)
{
dbus_pending_call_cancel(battery_config->hal.have);
@ -911,7 +913,7 @@ _battery_update(int full, int time_left, int have_battery, int have_power)
}
if (have_battery && (!have_power) && (full != 100) &&
((battery_config->alert && ((time_left / 60) <= battery_config->alert)) ||
(((time_left > 0) && battery_config->alert && ((time_left / 60) <= battery_config->alert)) ||
(battery_config->alert_p && (full <= battery_config->alert_p)))
)
{