From f3d13f99059a3b47f85729b6c0909e1d76d6bb7b Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Thu, 19 Jan 2006 15:22:06 +0000 Subject: Make sure that no targets lose charging related features from those red builds yesterday. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8389 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/gwps-common.c | 16 +++++++++------- apps/gui/statusbar.c | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index b2d06bc61f..c9d093963e 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c @@ -653,15 +653,17 @@ static char* get_tag(struct wps_data* wps_data, return buf; } + case 'p': /* External power plugged in? */ + { #ifdef HAVE_CHARGING - case 'p': /* External power plugged in? */ - { - if(charger_input_state==CHARGER) - return "p"; - else - return NULL; - } + if(charger_input_state==CHARGER) +#else + if(charger_inserted()) #endif + return "p"; + else + return NULL; + } #if defined(HAVE_CHARGE_CTRL) || \ defined (HAVE_CHARGE_STATE) || \ CONFIG_BATTERY == BATT_LIION2200 diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index d8e611af85..57308c52f2 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -129,6 +129,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); #ifdef HAVE_CHARGING bar->info.inserted = (charger_input_state == CHARGER); +#else + bar->info.inserted = charger_inserted(); #endif bar->info.battlevel = battery_level(); bar->info.battery_safe = battery_level_safe(); -- cgit v1.2.3