#66 removed hardcoded screen def in widgets notification

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 8675cb52bb2542978a584ab9e18b4b1b848505b5..96d57b08008f2b1e4921661a5fce6d254703c216 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -77,12 +77,10 @@ function alsabar.notify()
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
             preset      = preset,
         alsabar._notify = naughty.notify ({
             replaces_id = alsabar._notify.id,
             preset      = preset,

-            screen = client.focus and client.focus.screen or 1

         })
     else
         alsabar._notify = naughty.notify ({
             preset = preset,
         })
     else
         alsabar._notify = naughty.notify ({
             preset = preset,

-            screen = client.focus and client.focus.screen or 1

         })
     end
 end
         })
     end
 end

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 2ace758d7a786b5183a60f7d4f8fc2c58e4a8b62..572d099266ad2683bf6890f7e3682ef9546523ff 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -130,14 +130,12 @@ local function worker(args)
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id,
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id,

-                    screen = client.focus and client.focus.screen or 1

                 }).id
             elseif nperc <= 15
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id,
                 }).id
             elseif nperc <= 15
             then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id,

-                    screen = client.focus and client.focus.screen or 1

                 }).id
             end
         end
                 }).id
             end
         end

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index d07a5b4fff8c26068541e63206561a22b5770885..f9aed39820f38e6484825bb7779cf5912e63b97d 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -99,7 +99,6 @@ function calendar:show(t_out, inc_offset)
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,
         fg = calendar.fg,
         bg = calendar.bg,
         timeout = tims,

-        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end
 

diff --git a/widgets/contrib/init.lua b/widgets/contrib/init.lua
index 9a9fa63da598e036aac858d093665981747a0648..ccaed82bbb50656631fef57f3be8d55b5e601a0e 100644 (file)
--- a/widgets/contrib/init.lua
+++ b/widgets/contrib/init.lua
@@ -8,7 +8,6 @@
                                                    
      Licensed under GNU General Public License v2  
       * (c) 2013,      Luke Bonham                 
                                                    
      Licensed under GNU General Public License v2  
       * (c) 2013,      Luke Bonham                 

-      * (c) 2010-2012, Peter Hofmann               

                                                    
 --]]
 
                                                    
 --]]
 

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 6e6ebaeb7b4c0e74265527150eab69c76751da01..2e30cdc0f3845733cacfc788cabd85da1b1d2e55 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -2,7 +2,6 @@
 --[[
                                                   
      Licensed under GNU General Public License v2 
 --[[
                                                   
      Licensed under GNU General Public License v2 

-      * (c) 2013, Luke Bonham                     

       * (c) 2013, Jan Xie                         
                                                   
 --]]
       * (c) 2013, Jan Xie                         
                                                   
 --]]


@@ -20,7 +19,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Taskwarrior notification
 local setmetatable = setmetatable
 
 -- Taskwarrior notification

--- lain.widgets.task
+-- lain.widgets.contrib.task

 local task = {}
 
 local task_notification = nil
 local task = {}
 
 local task_notification = nil


@@ -52,7 +51,6 @@ function task:show()
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,
                                          fg = task.fg,
                                          bg = task.bg,
                                          timeout = task.timeout,

-                                         screen = client.focus and client.focus.screen or 1

                                      })
 end
 
                                      })
 end
 


@@ -75,7 +73,6 @@ function task:prompt_add()
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,

-              screen = client.focus and client.focus.screen or 1

           })
       end,
       nil,
           })
       end,
       nil,


@@ -109,7 +106,6 @@ function task:prompt_search()
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,
               fg       = task.fg,
               bg       = task.bg,
               timeout  = task.timeout,

-              screen = client.focus and client.focus.screen or 1

           })
       end,
       nil,
           })
       end,
       nil,

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f78cfe0d66f0d633ff87ff606421e8cf32632658..3b99cbaf9a60dab18c9612c07fdee39ac3dc90f6 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -47,7 +47,6 @@ function fs:show(t_out)
         preset = fs_notification_preset,
         text = ws,
         timeout = t_out,
         preset = fs_notification_preset,
         text = ws,
         timeout = t_out,

-        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end
 


@@ -100,7 +99,6 @@ local function worker(args)
                 timeout = 8,
                 fg = "#000000",
                 bg = "#FFFFFF",
                 timeout = 8,
                 fg = "#000000",
                 bg = "#FFFFFF",

-                screen = client.focus and client.focus.screen or 1

             })
             helpers.set_map("fs", true)
         else
             })
             helpers.set_map("fs", true)
         else

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 3a6da8dfe3e1500ba953372c06f8ea9bec2c253c..d4b4cba931521aedb53e9db6b6a2ca9fa56884b6 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -77,7 +77,6 @@ local function worker(args)
                 naughty.notify({
                     preset = mail_notification_preset,
                     text = nt,
                 naughty.notify({
                     preset = mail_notification_preset,
                     text = nt,

-                    screen = client.focus and client.focus.screen or 1

                 })
             end
 
                 })
             end
 

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 385b5bb8cd469ba9976be28c6f2dcca9ae29218b..7fd611d71fb7c80782d55aa4f0aa7d6d3b8955e0 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -91,7 +91,6 @@ local function worker(args)
                         preset = mpd_notification_preset,
                         icon = "/tmp/mpdcover.png",
                         replaces_id = mpd.id,
                         preset = mpd_notification_preset,
                         icon = "/tmp/mpdcover.png",
                         replaces_id = mpd.id,

-                        screen = client.focus and client.focus.screen or 1

                     }).id
                 end
             elseif mpd_now.state ~= "pause"
                     }).id
                 end
             elseif mpd_now.state ~= "pause"

diff --git a/widgets/net.lua b/widgets/net.lua
index 957500069de4cdb572dcd74b6372e400d890fd0a..2bfd375c337deb3f7b97fb211425ad07a8b32ab8 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -88,7 +88,6 @@ local function worker(args)
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     fg       = notify_fg or "#FFFFFF",
                     position = "top_left",
                     icon     = helpers.icons_dir .. "no_net.png",
                     fg       = notify_fg or "#FFFFFF",

-                    screen = client.focus and client.focus.screen or 1

                 })
                 helpers.set_map(iface, false)
             end
                 })
                 helpers.set_map(iface, false)
             end

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index aa58ed1986fd4f2076fc2bb686f9dde149710d5e..b034395f64681ba64dba40f1dfa2680cc36063f4 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -167,7 +167,6 @@ function yawn.show(t_out)
         text = weather_data,
         icon = sky,
         timeout = t_out,
         text = weather_data,
         icon = sky,
         timeout = t_out,

-        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end