3 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 49cb78f..8aac709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 (Format: Year/Month/Day)
 Changes for 0.1.13:
+*02/11/17:
+   * Fixed bug in toggleTab
+     Window.cc
+   * Fixed alignment bug in Tab
+     Tab.cc
+   * Fixed HAVE_XFT_UTF8 check (Simon)
+     configure.in, XftFontImp.cc
 *02/11/15:
    * Fixed antialias bug in toolbar
    * Fixed bug [ 627897 ] Clicking tab leads to crashing X-Server.
diff --git a/TODO b/TODO
index 6728653..0cb6084 100644
--- a/TODO
+++ b/TODO
@@ -32,8 +32,6 @@
 * Wheel-config support
 * Separator in the menus
 * Clean up in the global namespace
-* Add "system menu" for minimized apps in the icon bar.
-  (Close, Kill, Send to, etc)   
 * "Iconify group"/group commands in Windowmenu
 * Call and navigate menus from the keyboard (bind a menu to a key
   and use arrows to navigate)
@@ -45,5 +43,6 @@
   emacs), needed for the next wish:
 * "Goto Frame" as Emacs C-x b, that show completions in the bar
 * mouse button configure
-
+* Check FluxboxWindow::toggleDecor
+  Needs cleaning and check functions that uses this one. Should function struct really be affected by this function.
 
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index 09a2071..80f0e5b 100755
--- a/util/fluxbox-generate_menu
+++ b/util/fluxbox-generate_menu
@@ -22,7 +22,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-# $Id: fluxbox-generate_menu,v 1.11 2002/11/17 15:56:37 fluxgen Exp $
+# $Id: fluxbox-generate_menu,v 1.12 2002/11/17 17:36:50 fluxgen Exp $
 
 [ `id -u` -eq 0 ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
 
@@ -178,8 +178,8 @@ if [ -w ${FILENAME} ]; then
 fi
 
 #packagedatadir
-if [ ! -d "${PKGDATADIR}" ]; then
-    if [ `uname` = "Linux" ];then
+if [ ! -d "${PKGDATADIR}" -o "${PKGDATADIR}" = "" ]; then
+   if [ `uname` = "Linux" ];then
         PKGDATADIR=/usr/share
     else
         PKGDATADIR=/usr/local/share
@@ -187,12 +187,12 @@ if [ ! -d "${PKGDATADIR}" ]; then
 fi
 
 #gnome packagedatadir
-if [ ! -d "${GPKGDATADIR}" ]; then
+if [ ! -d "${GPKGDATADIR}" -o "${GPKGDATADIR}" = "" ]; then
     GPKGDATADIR=${PKGDATADIR}
 fi
 
 #kde packagedatadir
-if [ ! -d "${KPKGDATADIR}" ]; then
+if [ ! -d "${KPKGDATADIR}" -o "${KPKGDATADIR}" = "" ]; then
     KPKGDATADIR=${PKGDATADIR}
 fi