comment out google reader widget, I think it caused crashes

auto-flake-update
Yorick van Pelt 2012-11-22 20:05:21 +01:00
parent 8b63cc0d15
commit 921a651c36
1 changed files with 70 additions and 69 deletions

View File

@ -202,77 +202,77 @@ clock_icon:set_image(icon_dir .. "/clock.png")
-- google reader -- google reader
google_reader_widget = wibox.widget.textbox() -- google_reader_widget = wibox.widget.textbox()
google_reader_label = wibox.widget.textbox() -- google_reader_label = wibox.widget.textbox()
google_reader_label:set_markup("<span color='" .. beautiful.dgrey .. "'>RSS </span>") -- google_reader_label:set_markup("<span color='" .. beautiful.dgrey .. "'>RSS </span>")
do -- do
google_reader_widget:set_markup("<span color='" .. beautiful.dgrey .. "'>loading</span>") -- google_reader_widget:set_markup("<span color='" .. beautiful.dgrey .. "'>loading</span>")
local greader_timer = timer({ timeout = 315 }) -- 5:15 minutes -- local greader_timer = timer({ timeout = 315 }) -- 5:15 minutes
local greader_info = "loading" -- local greader_info = "loading"
local loading_widget = false -- local loading_widget = false
function update_google_reader() -- function update_google_reader()
-- protect against loading multiple times -- -- protect against loading multiple times
if loading_widget then -- if loading_widget then
return -- return
end -- end
loading_widget = true -- loading_widget = true
run_background("~/dotfiles/bin/reader_client.js totalunread", function (output) -- run_background("~/dotfiles/bin/reader_client.js totalunread", function (output)
loading_widget = false -- loading_widget = false
greader_info = output:match( "(.-)%s*$") -- removed trailing whitespace -- greader_info = output:match( "(.-)%s*$") -- removed trailing whitespace
google_reader_widget:set_markup("<span color='" .. beautiful.magenta .. "'>".. greader_info .."</span>") -- google_reader_widget:set_markup("<span color='" .. beautiful.magenta .. "'>".. greader_info .."</span>")
end) -- end)
end -- end
greader_timer:connect_signal("timeout", update_google_reader) -- greader_timer:connect_signal("timeout", update_google_reader)
greader_timer:start() -- greader_timer:start()
update_google_reader() -- update_google_reader()
-- tooltip stuff -- -- tooltip stuff
local greader_tooltip -- local greader_tooltip
local greader_info_details = "loading" -- local greader_info_details = "loading"
function remove_greader() -- function remove_greader()
if greader_tooltip~= nil then -- if greader_tooltip~= nil then
naughty.destroy(greader_tooltip) -- naughty.destroy(greader_tooltip)
greader_tooltip = nil -- greader_tooltip = nil
end -- end
end -- end
local loading_tooltip = false -- local loading_tooltip = false
function update_greader_tooltip() -- function update_greader_tooltip()
if loading_tooltip then -- if loading_tooltip then
return -- return
end -- end
loading_tooltip = true -- loading_tooltip = true
run_background("~/dotfiles/bin/reader_client.js unreadlist", function (output) -- run_background("~/dotfiles/bin/reader_client.js unreadlist", function (output)
loading_tooltip = false -- loading_tooltip = false
greader_info_details = string.gsub(output, "%$(%w+)", "%1") -- greader_info_details = string.gsub(output, "%$(%w+)", "%1")
greader_info_details = greader_info_details:match( "(.-)%s*$") -- removed trailing whitespace -- greader_info_details = greader_info_details:match( "(.-)%s*$") -- removed trailing whitespace
end) -- end)
end -- end
function add_greader() -- function add_greader()
remove_greader() -- remove_greader()
greader_tooltip = naughty.notify({ -- greader_tooltip = naughty.notify({
title = "<span color='" .. beautiful.dgrey .. "'>google reader ("..greader_info.." new)</span>", -- title = "<span color='" .. beautiful.dgrey .. "'>google reader ("..greader_info.." new)</span>",
text = greader_info_details, -- text = greader_info_details,
timeout = 0, -- timeout = 0,
screen = mouse.screen -- screen = mouse.screen
}) -- })
end -- end
update_greader_tooltip() -- update_greader_tooltip()
greader_timer:connect_signal("timeout", update_greader_tooltip) -- greader_timer:connect_signal("timeout", update_greader_tooltip)
google_reader_widget:connect_signal("mouse::enter", add_greader) -- google_reader_widget:connect_signal("mouse::enter", add_greader)
google_reader_widget:connect_signal("mouse::leave", remove_greader) -- google_reader_widget:connect_signal("mouse::leave", remove_greader)
google_reader_widget:buttons(awful.util.table.join( -- google_reader_widget:buttons(awful.util.table.join(
awful.button({ }, 1, function () awful.util.spawn("firefox reader.google.com", false) end), -- awful.button({ }, 1, function () awful.util.spawn("firefox reader.google.com", false) end),
awful.button({ }, 2, function () -- awful.button({ }, 2, function ()
update_greader_tooltip() -- update_greader_tooltip()
update_google_reader() -- update_google_reader()
end))) -- end)))
end -- end
-- battery -- battery
battery_widget = wibox.widget.textbox() battery_widget = wibox.widget.textbox()
@ -424,12 +424,13 @@ for s = 1, screen.count() do
right_layout:add(sqb_left) right_layout:add(sqb_left)
right_layout:add(wibox.widget.systray()) right_layout:add(wibox.widget.systray())
right_layout:add(sqb_right) right_layout:add(sqb_right)
right_layout:add(spacer)
end end
right_layout:add(sqb_left) --right_layout:add(sqb_left)
right_layout:add(google_reader_label) -- right_layout:add(google_reader_label)
right_layout:add(google_reader_widget) -- right_layout:add(google_reader_widget)
right_layout:add(sqb_right) --right_layout:add(sqb_right)
right_layout:add(spacer) --right_layout:add(spacer)
right_layout:add(sqb_left) right_layout:add(sqb_left)
right_layout:add(battery_icon) right_layout:add(battery_icon)
right_layout:add(battery_widget) right_layout:add(battery_widget)