godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Systray: Fix BadWindow (because of unmap event) and segfault at pressing button

Browse Source
This commit is contained in:
Martin Duquesnoy
2010-07-22 22:07:26 +02:00
parent 908978cca1
commit fdb1d2c748
4 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/event.c
View File

@@ -350,7 +350,7 @@ destroynotify(XDestroyWindowEvent *ev)
else if((s = systray_find(ev->window)))
{
setwinstate(s->win, WithdrawnState);
systray_del(s->win);
systray_del(s);
systray_update();
}
@@ -480,20 +480,11 @@ keypress(XKeyPressedEvent *ev)
void
mappingnotify(XMappingEvent *ev)
{
Systray *s;
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
grabkeys();
if(!(s = systray_find(ev->window)))
{
setwinstate(s->win, NormalState);
ewmh_send_message(s->win, s->win, "_XEMBED", CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, 0, 0);
}
return;
}
@@ -650,8 +641,7 @@ unmapnotify(XUnmapEvent *ev)
if((s = systray_find(ev->window)))
{
setwinstate(s->win, WithdrawnState);
systray_del(s->win);
systray_del(s);
systray_update();
}