Add devicetype to pulsbar to match pulseaudio and update sed command

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

diff --git a/widget/calendar.lua b/widget/calendar.lua
index 789676dc404788b91bb8469e71d4ba74fe607a92..2dda8908afdec255ffc54d14b01e688e0a958ba2 100644 (file)
--- a/widget/calendar.lua
+++ b/widget/calendar.lua
@@ -1,9 +1,8 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luke Bonham
+

 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")


@@ -38,8 +37,8 @@ function calendar.show(t_out, inc_offset, scr)
 
     if current_month then -- today highlighted
         calendar.offset = 0
 
     if current_month then -- today highlighted
         calendar.offset = 0

-        calendar.icon = string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
-        f = calendar.cal
+        calendar.icon   = calendar.icons:len() > 0 and string.format("%s%s.png", calendar.icons, tonumber(os.date("%d")))
+        f               = calendar.cal

     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
        local year  = tonumber(os.date("%Y"))
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
        local year  = tonumber(os.date("%Y"))


@@ -67,7 +66,7 @@ function calendar.show(t_out, inc_offset, scr)
 
         local widget_focused = true
 
 
         local widget_focused = true
 

-        if t_out == 0 then
+        if t_out == 0 and mouse.current_widgets then

             widget_focused = false
             for i, widget in ipairs(calendar.attach_to) do
                 for _,v in ipairs(mouse.current_widgets) do
             widget_focused = false
             for i, widget in ipairs(calendar.attach_to) do
                 for _,v in ipairs(mouse.current_widgets) do