alsabar: revert #275; remove buttons and beautiful deps

[etc/awesome.git] / widgets / imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 1e867383d0271050742de1c09ea6f8e2464e8608..0f8d994d09e75600f0f70a87d20f9ecbee6b5578 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,14 +7,12 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-
+local shell        = require("awful.util").shell

 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 local wibox        = require("wibox")

-

 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber

-

 local setmetatable = setmetatable
 
 -- Mail IMAP check
 local setmetatable = setmetatable
 
 -- Mail IMAP check


@@ -38,7 +36,9 @@ local function worker(args                           )
     helpers.set_map(mail, 0)
 
     if not is_plain then
     helpers.set_map(mail, 0)
 
     if not is_plain then

-        helpers.async(password, function(f) password = f:gsub("\n", "") end)
+        helpers.async(string.format("%s -s '%s'", shell, password), function(f)
+            password = f:gsub("\n", "")
+        end)

     end
 
     function update()
     end
 
     function update()


@@ -51,11 +51,12 @@ local function worker(args                           )
             mail_notification_preset.screen = awful.screen.focused()
         end
 
             mail_notification_preset.screen = awful.screen.focused()
         end
 

-        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
-               head_command, server, port, mail, password, request)
+        curl = string.format("%s -c '%s --url imaps://%s:%s/INBOX -u %s:%q %s -k'",
+               shell, head_command, server, port, mail, password, request)

 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")

+            _ = nil

 
             widget = imap.widget
             settings()
 
             widget = imap.widget
             settings()