Merge pull request #303 from 2009/patch-4

[etc/awesome.git] / widgets / contrib / task.lua

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 4325437fe11dbf4a210a27d2082b86c91f53d2af..4a9b5b6fc6f023e9a71e43eaf3072ab0056a7a76 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -7,6 +7,7 @@
 --]]
 
 local helpers = require("lain.helpers")
 --]]
 
 local helpers = require("lain.helpers")

+local markup  = require("lain.util").markup

 local awful   = require("awful")
 local naughty = require("naughty")
 local string  = { format = string.format, gsub = string.gsub }
 local awful   = require("awful")
 local naughty = require("naughty")
 local string  = { format = string.format, gsub = string.gsub }


@@ -32,7 +33,7 @@ function task.show(scr)
 
     helpers.async(task.show_cmd, function(f)
         task.notification = naughty.notify({
 
     helpers.async(task.show_cmd, function(f)
         task.notification = naughty.notify({

-            preset = task_notification_preset,
+            preset = task.notification_preset,

             title  = task.show_cmd,
             text   = markup.font(task.notification_preset.font,
                      awful.util.escape(f:gsub("\n*$", "")))
             title  = task.show_cmd,
             text   = markup.font(task.notification_preset.font,
                      awful.util.escape(f:gsub("\n*$", "")))


@@ -66,9 +67,10 @@ function task.attach(widget, args)
     task.notification_preset = args.notification_preset
 
     if not task.notification_preset then
     task.notification_preset = args.notification_preset
 
     if not task.notification_preset then

-        task.notification_preset      = naughty.config.defaults
-        task.notification_preset.font = "Monospace 10"
-        task.notification_preset.icon = helpers.icons_dir .. "/taskwarrior.png"
+        task.notification_preset = {
+            font = "Monospace 10",
+            icon = helpers.icons_dir .. "/taskwarrior.png"
+        }

     end
 
     if widget then
     end
 
     if widget then