little cleanup

3 files changed, 1 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index cd976c0..cb16560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,8 +22,7 @@ Changes for 1.0rc3:
    * Updated nb_NO translations (thanks emptydoor at users dot sf dot net)
      nls/nb_NO/Translation.m
    * Changing session.forcePseudotransparency no longer requires restart,
-     also a little code cleanup in FbTk/Transparent.cc/hh
-     (Mark)
+     also a little code cleanup in FbTk/Transparent.cc/hh (Mark)
      Slit.cc Menu.cc Toolbar.cc FbWinFrame.cc fluxbox.cc
    * Move triangle drawing into a generic function in FbDrawable (Simon)
      Make submenu triangles in MenuItems proportional to the icon size
@@ -99,7 +98,6 @@ Changes for 1.0rc3:
 *06/12/28:
    * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark)
      Toolbar.cc
-*06/12/28:
    * Allow focus to revert to stuck windows (Mark)
      FocusControl.cc
 *06/12/27:
diff --git a/src/IconButton.cc b/src/IconButton.cc
index aaff5b8..eaae85e 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -255,7 +255,6 @@ void IconButton::update(FbTk::Subject *subj) {
         FbTk::translateCoords(orientation(), iconx, icony, w, h);
         FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0);
         
-        neww = newh;
         m_icon_window.moveResize(iconx, icony, neww, newh);
 
         m_icon_pixmap.copy(m_win.iconPixmap().drawable(), DefaultDepth(display, screen), screen);
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 86d7f51..ad4eeeb 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -559,8 +559,6 @@ void IconbarTool::update(FbTk::Subject *subj) {
         deleteIcons();
 
     // ok, we got some signal that we need to update our iconbar container
-    if (mode() == NONE)
-        return;
     updateList();
 
     // unlock container and update graphics