aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-14 15:01:55 (GMT)
committerfluxgen <fluxgen>2003-04-14 15:01:55 (GMT)
commit2928b32f3a399527113325de3db39cd75db4ee8e (patch)
tree53c9d8e3676e35a200314df700344ef2711fb7b4 /src/Toolbar.cc
parentb6ca956c821e1e968dda10ee7852c6933b549b08 (diff)
downloadfluxbox-2928b32f3a399527113325de3db39cd75db4ee8e.zip
fluxbox-2928b32f3a399527113325de3db39cd75db4ee8e.tar.bz2
merged with embedded-tab-branch
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 00a70e8..cd05164 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -1,5 +1,5 @@
1// Toolbar.cc for Fluxbox 1// Toolbar.cc for Fluxbox
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net) 2// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Toolbar.cc for Blackbox - an X11 Window manager 4// Toolbar.cc for Blackbox - an X11 Window manager
5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.68 2003/04/09 17:20:04 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.69 2003/04/14 14:53:56 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -736,7 +736,7 @@ void Toolbar::redrawWindowLabel(bool redraw) {
736 736
737 FluxboxWindow *foc = Fluxbox::instance()->getFocusedWindow(); 737 FluxboxWindow *foc = Fluxbox::instance()->getFocusedWindow();
738 // don't draw focused window if it's not on the same screen 738 // don't draw focused window if it's not on the same screen
739 if (foc->getScreen() != &screen() || foc->getTitle().size() == 0) 739 if (&foc->getScreen() != &screen() || foc->getTitle().size() == 0)
740 return; 740 return;
741 741
742 unsigned int newlen = foc->getTitle().size(); 742 unsigned int newlen = foc->getTitle().size();