aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-25 08:46:51 (GMT)
committerrathnor <rathnor>2003-07-25 08:46:51 (GMT)
commit9ca1f367cb9eef78ee1871fe5b96298f8325d987 (patch)
treef1483255ccde33eb1c2ea005bd48d4ecd1b8ef4a
parente2f24826155bc756932836ccaa536ac3d41580b9 (diff)
downloadfluxbox_paul-9ca1f367cb9eef78ee1871fe5b96298f8325d987.zip
fluxbox_paul-9ca1f367cb9eef78ee1871fe5b96298f8325d987.tar.bz2
fix bug that gave inconsistent icons, plus caused crashes
-rw-r--r--BUGS25
-rw-r--r--ChangeLog3
-rw-r--r--src/ToolbarHandler.cc5
3 files changed, 6 insertions, 27 deletions
diff --git a/BUGS b/BUGS
index f5a807b..6c0fa58 100644
--- a/BUGS
+++ b/BUGS
@@ -85,28 +85,3 @@ Fixed bugs (or not-our-fault bugs):
85 layer-wise (other transient flashes) 85 layer-wise (other transient flashes)
86 => fixed 86 => fixed
87 87
88------------------------------
89Core dumps and notes
90
91Simon, 19/7/03.
92Dump on workspace change. Toolbarmode = workspace
93Interesting points:
94(gdb) p fluxboxwin->m_client
95$2 = (class WinClient *) 0x42424141
96==> the fluxboxwin is probably dead
97
98#5 0x401ab518 in sigaction () from /lib/libc.so.6
99#6 0x0806199d in basic_string<char, string_char_traits<char>, __default_alloc_template<true, 0> >::size (this=0x424241d5)
100 at /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/std/bastring.h:156
101#7 0x080aab44 in IconBar::draw (this=0x819e888, obj=0x81998e0, width=56)
102 at IconBar.cc:363
103#8 0x080aa842 in IconBar::exposeEvent (this=0x819e888, ee=0xbffff44c)
104 at IconBar.cc:265
105#9 0x080a4f23 in Toolbar::exposeEvent (this=0x8198cc8, ee=@0xbffff44c)
106 at Toolbar.cc:1095
107#10 0x080ac1ac in FbTk::EventManager::handleEvent (this=0x81406ec,
108 ev=@0xbffff44c) at EventManager.cc:71
109#11 0x0805a63c in Fluxbox::handleEvent (this=0x8142220, e=0xbffff44c)
110 at fluxbox.cc:740
111#12 0x08059a14 in Fluxbox::eventLoop (this=0x8142220) at fluxbox.cc:597
112
diff --git a/ChangeLog b/ChangeLog
index dd12f68..f0a4f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.5: 2Changes for 0.9.5:
3*03/07/25:
4 * Fix pesky crash and phantom icons (diesig wasn't getting through) (Simon)
5 ToolbarHandler.cc
3*03/07/24: 6*03/07/24:
4 * Fix some maximisation issues (Simon) 7 * Fix some maximisation issues (Simon)
5 Window.hh/cc FbCommandFactory.cc 8 Window.hh/cc FbCommandFactory.cc
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index 5db8f44..d5682e9 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ToolbarHandler.cc,v 1.24 2003/07/20 02:45:57 rathnor Exp $ 23// $Id: ToolbarHandler.cc,v 1.25 2003/07/25 08:46:51 rathnor Exp $
24 24
25/** 25/**
26 * The ToolbarHandler class acts as a rough interface to the toolbar. 26 * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -159,6 +159,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen)
159 // (we only want it done once, so it can't go in initforscreen) 159 // (we only want it done once, so it can't go in initforscreen)
160 160
161 screen.addConfigMenu("Toolbar", m_toolbarmenu); 161 screen.addConfigMenu("Toolbar", m_toolbarmenu);
162 enableUpdate();
162} 163}
163 164
164void ToolbarHandler::setMode(ToolbarMode newmode, bool initialise) { 165void ToolbarHandler::setMode(ToolbarMode newmode, bool initialise) {
@@ -284,7 +285,7 @@ void ToolbarHandler::setupFrame(FluxboxWindow &win) {
284 case NONE: 285 case NONE:
285 break; 286 break;
286 case WORKSPACE: 287 case WORKSPACE:
287 if (win.workspaceNumber() == m_current_workspace) 288 if (win.workspaceNumber() == m_current_workspace)
288 m_toolbar->addIcon(&win); 289 m_toolbar->addIcon(&win);
289 break; 290 break;
290 case WORKSPACEICONS: 291 case WORKSPACEICONS: