Merge branch 'desktop'

rc.lua

@@ -10,7 +10,6 @@ require("awful.rules")
 require("beautiful")
 require("naughty")
 require("teardrop")
-require("obvious.battery")
 require("obvious.popup_run_prompt")
 require("vicious")
 require("aweswt")

rules.lua

@@ -39,6 +39,8 @@ awful.rules.rules = {
       properties = { tag = tags[1][4] } },
     { rule = { class = "Thunderbird" },
       properties = { tag = tags[1][4] } },
+    { rule = { class = "Claws-mail" },
+      properties = { tag = tags[1][4] } },
     { rule = { class = "Sunbird-bin" },
       properties = { tag = tags[1][5] } },
     { rule = { class = "Gmpc" },

wibox.lua

@@ -23,7 +23,7 @@ vicious.register(memwidget, vicious.widgets.mem, "⌸ $1% ($2MB / $3MB) ", 13)
 
 --batwidget  = obvious.battery();
 batwidget = widget({ type = "textbox" })
-vicious.register(batwidget, vicious.widgets.batat, "⌁ $1$2% - $3", 61)
+vicious.register(batwidget, vicious.widgets.bat, "⌁ $1$2% - $3", 61)
 
 cpuwidget = awful.widget.progressbar()
 cpulabel = widget({ type = "textbox" })