Change Makefile to make releases containing our current directory structure

[i3/i3status] / src / print_battery_info.c

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index eb1f6bb2fb49f5aa9fff6cd51cc0a33640acc2d0..4685d52afc2a89d00a40ff72a887e38644f35f08 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -16,7 +16,7 @@
  * worn off your battery is.
  *
  */
-void print_battery_info(int number, const char *format) {
+void print_battery_info(int number, const char *format, bool last_full_capacity) {
         char buf[1024];
         char *walk, *last;
         int full_design = -1,
@@ -52,17 +52,15 @@ void print_battery_info(int number, const char *format) {
                         status = CS_FULL;
                 else {
                         /* The only thing left is the full capacity */
-#if 0
-                        if (bat->use_last_full) {
+                        if (last_full_capacity) {
                                 if (!BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") &&
                                     !BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL"))
                                         continue;
                         } else {
-#endif
                                 if (!BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") &&
                                     !BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN"))
                                         continue;
-                        //}
+                        }
 
                         full_design = atoi(walk+1);
                 }