fix bug where destroying the wrong windows in BlackboxWindow::positionButtons.

make util/ directory use the new config.h too

diff --git a/src/Window.cc b/src/Window.cc
index a1be1f7eea5f7d0b96b540fbfd280f6649536a0e..a876e110352d5e3c38688cbf49fad1a15046cab4 100644 (file)
--- 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 886f19dc5a2506a2e404a0ff21f7cbe4bd3197aa..e0f3ecc68b654478234943de7095f335af0e2ee1 100644 (file)
--- 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