fix #321

[etc/awesome.git] / widget / bat.lua

diff --git a/widget/bat.lua b/widget/bat.lua
index 9976517423aaf61d4aa6c97855dfed2795c1c63d..3067b39a4c0cad2fb9584975209d2a71545c1ce6 100644 (file)
--- a/widget/bat.lua
+++ b/widget/bat.lua
@@ -17,7 +17,6 @@ local math       = { abs    = math.abs,
                      min    = math.min }
 local string     = { format = string.format }
 local ipairs     = ipairs
-local type       = type
 local tonumber   = tonumber
 
 -- Battery infos
@@ -119,9 +118,9 @@ local function factory(args)
 
         if bat_now.status ~= "N/A" then
             if bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
-                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
-                                                               bat_now.time  = "00:00"
-                                                               bat_now.watt  = 0
+                bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0
 
             -- update {perc,time,watt} iff battery not full and rate > 0
             elseif bat_now.status ~= "Full" then
@@ -158,13 +157,13 @@ local function factory(args)
         settings()
 
         -- notifications for low and critical states
-        if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then
-            if bat_now.perc <= 5 then
+        if notify == "on" and bat_now.status == "Discharging" then
+            if tonumber(bat_now.perc) <= 5 then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id
-            elseif bat_now.perc <= 15 then
+            elseif tonumber(bat_now.perc) <= 15 then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id