devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix my mess in r15419: LANG_BATTERY_TOPOFF_CHARGE is only defined

Browse source 
when CONFIG_CHARGING == CHARGING_CONTROL.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15424 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stéphane Doyon 2007-11-03 05:40:22 +00:00
parent 4bce3ad98a
commit fe2f1af0d3
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/menus/main_menu.c
View file

@ -211,9 +211,13 @@ static char* info_getname(int selected_item, void *data, char *buffer)
#elif CONFIG_CHARGING >= CHARGING_MONITOR
if (charge_state == CHARGING)
snprintf(buffer, MAX_PATH, (char *)str(LANG_BATTERY_CHARGE));
else if (charge_state == TOPOFF)
else
#if CONFIG_CHARGING == CHARGING_CONTROL
if (charge_state == TOPOFF)
snprintf(buffer, MAX_PATH, (char *)str(LANG_BATTERY_TOPOFF_CHARGE));
else if (charge_state == TRICKLE)
else
#endif
if (charge_state == TRICKLE)
snprintf(buffer, MAX_PATH, (char *)str(LANG_BATTERY_TRICKLE_CHARGE));
else
#endif
@ -295,9 +299,13 @@ static int info_speak_item(int selected_item, void * data)
#elif CONFIG_CHARGING >= CHARGING_MONITOR
if (charge_state == CHARGING)
talk_id(LANG_BATTERY_CHARGE, true);
else if (charge_state == TOPOFF)
else
#if CONFIG_CHARGING == CHARGING_CONTROL
if (charge_state == TOPOFF)
talk_id(LANG_BATTERY_TOPOFF_CHARGE, true);
else if (charge_state == TRICKLE)
else
#endif
if (charge_state == TRICKLE)
talk_id(LANG_BATTERY_TRICKLE_CHARGE, true);
else
#endif