widget.cal: set length of day names to 3; closes #426

[etc/awesome.git] / widget / contrib / tp_smapi.lua

diff --git a/widget/contrib/tp_smapi.lua b/widget/contrib/tp_smapi.lua
index e6da91845e17387641ea3a118ff95d326cdeff78..b8acbe2cdedf0bc033ccbc122da943eba38be619 100644 (file)
--- a/widget/contrib/tp_smapi.lua
+++ b/widget/contrib/tp_smapi.lua
@@ -12,6 +12,7 @@ local gears   = require("gears")
 local naughty = require("naughty")
 local wibox   = require("wibox")
 local string  = string
 local naughty = require("naughty")
 local wibox   = require("wibox")
 local string  = string

+local type    = type

 
 -- ThinkPad battery infos and widget creator
 -- http://www.thinkwiki.org/wiki/Tp_smapi
 
 -- ThinkPad battery infos and widget creator
 -- http://www.thinkwiki.org/wiki/Tp_smapi


@@ -19,7 +20,7 @@ local string  = string
 
 local function factory(apipath)
     local tp_smapi = {
 
 local function factory(apipath)
     local tp_smapi = {

-        path = apipath or "/sys/devices/platform/tp_smapi"
+        path = apipath or "/sys/devices/platform/smapi"

     }
 
     function tp_smapi.get(batid, feature)
     }
 
     function tp_smapi.get(batid, feature)


@@ -35,7 +36,7 @@ local function factory(apipath)
     end
 
     function tp_smapi.percentage(batid)
     end
 
     function tp_smapi.percentage(batid)

-        return tp_smapi.get("remaining_percent")
+        return tp_smapi.get(batid, "remaining_percent")

     end
 
     -- either running or charging time
     end
 
     -- either running or charging time


@@ -73,7 +74,7 @@ local function factory(apipath)
         tp_smapi.notification = naughty.notify {
             title   = string.format("%s: %s %s (%s)", batid, mfgr, model, chem),
             text    = msg,
         tp_smapi.notification = naughty.notify {
             title   = string.format("%s: %s %s (%s)", batid, mfgr, model, chem),
             text    = msg,

-            timeout = seconds or 0,
+            timeout = type(seconds) == "number" and seconds or 0,

             screen  = scr or focused()
         }
     end
             screen  = scr or focused()
         }
     end