1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## tray_hotfixes.dpatch, reverting a weird CVS change creating races
6 Index: icewm-1.3.7~pre2/src/icetray.cc
7 ===================================================================
8 --- icewm-1.3.7~pre2.orig/src/icetray.cc 2010-04-28 21:00:30.000000000 +0200
9 +++ icewm-1.3.7~pre2/src/icetray.cc 2010-04-29 22:11:16.938048246 +0200
11 bool checkMessageEvent(const XClientMessageEvent &message);
14 - void handleUnmap(const XUnmapEvent &ev) {
15 - YWindow::handleUnmap(ev);
17 -// if (visible() && ev.window == handle()) {
19 + void handleUnmap(const XUnmapEvent &) {
29 Atom icewm_internal_tray;
30 Atom _NET_SYSTEM_TRAY_OPCODE;
35 class SysTrayApp: public YXApplication {
37 setSize(fTray2->width(),
45 fTray2->backgroundChanged();
46 setSize(fTray2->width(),
48 - if (fTray2->visible()) {
55 + if (fTray2->visible())
62 void SysTray::requestDock() {
65 XSendEvent(xapp->display(), w, False, StructureNotifyMask, (XEvent *) &xev);
70 bool SysTray::checkMessageEvent(const XClientMessageEvent &message) {
71 if (message.message_type == icewm_internal_tray) {
72 - MSG(("requestDock %lX", (long)handle()));
73 - setSize(fTray2->width(),
75 - MSG(("requestDock2 %d %d", width(), height()));
76 - if (fTray2->visible())
80 + MSG(("requestDock"));