summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-05-28 09:38:40 +0000
committerDana Jansens <danakj@orodu.net>2002-05-28 09:38:40 +0000
commit6284d4ef9036764d4e6f708ca5f38aa7c1749865 (patch)
tree9f7d0001be7c169a9d03996a1c045da38e8c915e
parent62ea1c5937b8d9dec82954e74da3fd2e712f2386 (diff)
fix bug where destroying the wrong windows in BlackboxWindow::positionButtons.
make util/ directory use the new config.h too
-rw-r--r--src/Window.cc10
-rw-r--r--util/Makefile.am2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index a1be1f7e..a876e110 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -684,12 +684,12 @@ void BlackboxWindow::positionButtons(bool redecorate_label) {
}
}
}
- if (! hasclose)
- destroyCloseButton();
- if (! hasiconify)
- destroyCloseButton();
- if (! hasmaximize)
+ if (! hasclose && frame.close_button)
destroyCloseButton();
+ if (! hasiconify && frame.iconify_button)
+ destroyIconifyButton();
+ if (! hasmaximize && frame.maximize_button)
+ destroyMaximizeButton();
if (! haslabel)
parsed += 'L'; // require that the label be in the layout
diff --git a/util/Makefile.am b/util/Makefile.am
index 886f19dc..e0f3ecc6 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
# util/Makefile.am for Blackbox - an X11 Window manager
-CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @ORDEREDPSEUDO@
+CPPFLAGS= @CPPFLAGS@ @DEBUG@
bin_SCRIPTS = bsetbg
bin_PROGRAMS = bsetroot