From 8692498308f09aa4c943b705bec9c8a70a20e936 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 16 May 2010 15:00:35 +0000 Subject: [PATCH] hmm i wonder who broke batget - changed it from 5 to 4 params. SVN revision: 48915 --- src/modules/battery/batget.c | 4 ++-- src/modules/battery/e_mod_main.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c index 50ec49c4a..f808197f2 100644 --- a/src/modules/battery/batget.c +++ b/src/modules/battery/batget.c @@ -1544,8 +1544,8 @@ poll_cb(void *data __UNUSED__) ((have_battery) && (battery_full < 0))) printf("ERROR\n"); else - printf("%i %i %i %i\n", - battery_full, time_left, have_battery, have_power); + printf("%i %i %i %i %i\n", + battery_full, time_left, time_left, have_battery, have_power); fflush(stdout); } return 1; diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index c6bb8b506..047324144 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -1311,14 +1311,16 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event) { int full = 0; int time_left = 0; - int time_full = 0; + int time_full = 0; int have_battery = 0; int have_power = 0; if (sscanf(ev->lines[i].line, "%i %i %i %i %i", - &full, &time_left, &time_full, &have_battery, &have_power) + &full, &time_left, &time_full, + &have_battery, &have_power) == 5) - _battery_update(full, time_left, time_full, have_battery, have_power); + _battery_update(full, time_left, time_full, + have_battery, have_power); else e_powersave_mode_set(E_POWERSAVE_MODE_LOW); }