summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/gwps-common.c16
-rw-r--r--apps/gui/statusbar.c2
2 files changed, 11 insertions, 7 deletions
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,
653 return buf; 653 return buf;
654 } 654 }
655 655
656 case 'p': /* External power plugged in? */
657 {
656#ifdef HAVE_CHARGING 658#ifdef HAVE_CHARGING
657 case 'p': /* External power plugged in? */ 659 if(charger_input_state==CHARGER)
658 { 660#else
659 if(charger_input_state==CHARGER) 661 if(charger_inserted())
660 return "p";
661 else
662 return NULL;
663 }
664#endif 662#endif
663 return "p";
664 else
665 return NULL;
666 }
665#if defined(HAVE_CHARGE_CTRL) || \ 667#if defined(HAVE_CHARGE_CTRL) || \
666 defined (HAVE_CHARGE_STATE) || \ 668 defined (HAVE_CHARGE_STATE) || \
667 CONFIG_BATTERY == BATT_LIION2200 669 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)
129 bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); 129 bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume);
130#ifdef HAVE_CHARGING 130#ifdef HAVE_CHARGING
131 bar->info.inserted = (charger_input_state == CHARGER); 131 bar->info.inserted = (charger_input_state == CHARGER);
132#else
133 bar->info.inserted = charger_inserted();
132#endif 134#endif
133 bar->info.battlevel = battery_level(); 135 bar->info.battlevel = battery_level();
134 bar->info.battery_safe = battery_level_safe(); 136 bar->info.battery_safe = battery_level_safe();