From fe2f1af0d3374b1a87ba958b67cb92729bf76071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Doyon?= Date: Sat, 3 Nov 2007 05:40:22 +0000 Subject: Fix my mess in r15419: LANG_BATTERY_TOPOFF_CHARGE is only defined when CONFIG_CHARGING == CHARGING_CONTROL. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15424 a1c6a512-1295-4272-9138-f99709370657 --- apps/menus/main_menu.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index ddc2689..93d937e 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -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 -- cgit v1.1