diff options
| author | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 15:22:06 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 15:22:06 +0000 |
| commit | f3d13f99059a3b47f85729b6c0909e1d76d6bb7b (patch) | |
| tree | 971f0740520dd7bd5f631b33325c078d1e1bc19d /apps/gui | |
| parent | 127c3febc130c4f35ed7e66601a7a59a78fa97a9 (diff) | |
| download | rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.zip rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.tar.gz rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.tar.bz2 rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.tar.xz | |
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
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/gwps-common.c | 16 | ||||
| -rw-r--r-- | apps/gui/statusbar.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index b2d06bc..c9d0939 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 d8e611a..57308c5 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(); |