aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-18 05:28:22 (GMT)
committersimonb <simonb>2006-04-18 05:28:22 (GMT)
commit939ffc7ef1ba358e4f7bf874fe24a0418d40eb41 (patch)
tree705c101eb782297ed7aef7f933afae7d47fdc29c
parentb9af026688f0945196582af5773d62f5df3f97f3 (diff)
downloadfluxbox_paul-939ffc7ef1ba358e4f7bf874fe24a0418d40eb41.zip
fluxbox_paul-939ffc7ef1ba358e4f7bf874fe24a0418d40eb41.tar.bz2
fix freeze in systemtray configuring, sf.net bug #1359442
-rw-r--r--ChangeLog2
-rw-r--r--src/SystemTray.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c5593f1..9250265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/18: 3*06/04/18:
4 * Fix system tray resize looping/livelock, sf.net bug #1359442 (Simon)
5 SystemTray.cc
4 * Fix iconbar updates (icon and title) 6 * Fix iconbar updates (icon and title)
5 (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org) 7 (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
6 WinClient.hh/cc Window.hh/cc IconButton.cc IconbarTool.cc WinButton.cc 8 WinClient.hh/cc Window.hh/cc IconButton.cc IconbarTool.cc WinButton.cc
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 1cab673..e9adeae 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -359,9 +359,10 @@ void SystemTray::handleEvent(XEvent &event) {
359 359
360 // this was why gaim wasn't centring the icon 360 // this was why gaim wasn't centring the icon
361 (*it)->sendConfigureNotify(0, 0, (*it)->width(), (*it)->height()); 361 (*it)->sendConfigureNotify(0, 0, (*it)->width(), (*it)->height());
362 // so toolbar know that we changed size
363 // done inside this loop, because otherwise we can get into nasty looping
364 resizeSig().notify();
362 } 365 }
363 // so toolbar know that we changed size
364 resizeSig().notify();
365 } 366 }
366 367
367 } 368 }