]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/imap.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

some fixes
[etc/awesome.git] / widgets / imap.lua
index 94652b69294c7a92169626bf0769af17fb7fcedc..5f8667dd5fee583cabd7e7fe3931d2afcacff5d0 100644 (file)
@@ -35,8 +35,7 @@ function worker(args)
     local refresh_timeout = args.refresh_timeout or 60
     local header = args.header or " Mail "
     local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
     local refresh_timeout = args.refresh_timeout or 60
     local header = args.header or " Mail "
     local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color_newmail = args.color_newmail or beautiful.fg_focus or "#FFFFFF"
-    local color_nomail = args.color_nomail or beautiful.fg_normal or "#FFFFFF"
+    local color = args.color or beautiful.fg_focus or "#FFFFFF"
     local mail_encoding = args.mail_encoding or nil
     local maxlen = args.maxlen or 200
     local app = args.app or "mutt"
     local mail_encoding = args.mail_encoding or nil
     local maxlen = args.maxlen or 200
     local app = args.app or "mutt"
@@ -63,7 +62,7 @@ function worker(args)
             then
                 myimapcheck:set_text('')
             else
             then
                 myimapcheck:set_text('')
             else
-                myimapcheck:set_markup(markup(color_nomail, " no mail "))
+                myimapcheck:set_markup(markup(color, " no mail "))
             end
         end
 
             end
         end
 
@@ -97,8 +96,8 @@ function worker(args)
         elseif ws:find("CheckMailError: invalid credentials") ~= nil
         then
             helpers.set_map(mail, true)
         elseif ws:find("CheckMailError: invalid credentials") ~= nil
         then
             helpers.set_map(mail, true)
-            myimapcheck.set_markup(markup(header_color, header) ..
-                                   markup(color_newmail, "invalid credentials "))
+            myimapcheck:set_markup(markup(header_color, header) ..
+                                   markup(color, "invalid credentials "))
         else
             mailcount = ws:match("%d") or "?"
 
         else
             mailcount = ws:match("%d") or "?"
 
@@ -109,7 +108,7 @@ function worker(args)
             end
 
             myimapcheck:set_markup(markup(header_color, header) ..
             end
 
             myimapcheck:set_markup(markup(header_color, header) ..
-                                   markup(color_newmail, mailcount) .. " ")
+                                   markup(color, mailcount) .. " ")
 
             if helpers.get_map(mail)
             then
 
             if helpers.get_map(mail)
             then
@@ -137,7 +136,7 @@ function worker(args)
                 end
 
                 naughty.notify({ title = notify_title,
                 end
 
                 naughty.notify({ title = notify_title,
-                                 fg = color_newmail,
+                                 fg = color,
                                  text = ws,
                                  icon = beautiful.lain_mail_notify or
                                         helpers.icons_dir .. "mail.png",
                                  text = ws,
                                  icon = beautiful.lain_mail_notify or
                                         helpers.icons_dir .. "mail.png",