Do not attempt to call global destroy

Signed-off-by: Felix Bier <flx.bier@googlemail.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Felix Bier 2012-06-22 19:46:41 +02:00 committed by Uli Schlachter
parent 77b5dadac4
commit aa7d342645
1 changed files with 2 additions and 2 deletions

View File

@ -193,7 +193,7 @@ local function get_offset(screen, position, idx, width, height)
-- if positioned outside workarea, destroy oldest popup and recalculate -- if positioned outside workarea, destroy oldest popup and recalculate
if v.y + height > ws.y + ws.height or v.y < ws.y then if v.y + height > ws.y + ws.height or v.y < ws.y then
idx = idx - 1 idx = idx - 1
destroy(notifications[screen][position][1]) naughty.destroy(notifications[screen][position][1])
v = get_offset(screen, position, idx, width, height) v = get_offset(screen, position, idx, width, height)
end end
if not v.idx then v.idx = idx end if not v.idx then v.idx = idx end
@ -568,7 +568,7 @@ if capi.dbus then
elseif data.member == "CloseNotification" then elseif data.member == "CloseNotification" then
local obj = getById(appname) local obj = getById(appname)
if obj then if obj then
destroy(obj) naughty.destroy(obj)
end end
elseif data.member == "GetServerInfo" or data.member == "GetServerInformation" then elseif data.member == "GetServerInfo" or data.member == "GetServerInformation" then
-- name of notification app, name of vender, version -- name of notification app, name of vender, version