From 5e2bcf03d6c918700a6b1f00d97993ff3a4c5a08 Mon Sep 17 00:00:00 2001 From: Joris van Zwieten Date: Tue, 2 Aug 2011 16:21:20 +0200 Subject: [PATCH 1/2] Fix segfault on selbar de-allocation. fixes #138 --- src/infobar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/infobar.c b/src/infobar.c index 2958d9c..c01f380 100644 --- a/src/infobar.c +++ b/src/infobar.c @@ -350,7 +350,9 @@ infobar_destroy(void) barwin_delete_subwin(infobar[sc].tags_board); barwin_delete(infobar[sc].tags_board); - barwin_delete(infobar[sc].selbar); + if(conf.bars.selbar) + barwin_delete(infobar[sc].selbar); + barwin_delete_subwin(infobar[sc].bar); barwin_delete(infobar[sc].bar); } From ec5b71b3719844935cf8300c2dd3c4d7a4dffe36 Mon Sep 17 00:00:00 2001 From: Philippe Pepiot Date: Wed, 3 Aug 2011 20:15:13 +0200 Subject: [PATCH 2/2] Build System: Freetype only when use Xft Signed-off-by: Philippe Pepiot --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 874ebae..8a9ec9b 100755 --- a/configure +++ b/configure @@ -1,10 +1,10 @@ #!/bin/sh -LIBS="x11 xft freetype2" +LIBS="x11" USE_XINERAMA="xinerama" USE_XRANDR="xrandr" USE_IMLIB2="imlib2" -USE_XFT="xft" +USE_XFT="xft freetype2" OS=`uname -s` PREFIX=/usr/local MANPREFIX="$PREFIX/man" @@ -72,12 +72,12 @@ else exit 1;; esac - LDFLAGS="$LDFLAGS -lX11 -lfreetype" + LDFLAGS="$LDFLAGS -lX11" [ -n "$USE_XINERAMA" ] && LDFLAGS="$LDFLAGS -lXinerama" [ -n "$USE_XRANDR" ] && LDFLAGS="$LDFLAGS -lXrandr" [ -n "$USE_IMLIB2" ] && LDFLAGS="$LDFLAGS -lImlib2" - [ -n "$USE_XFT" ] && LDFLAGS="$LDFLAGS -lXft" + [ -n "$USE_XFT" ] && LDFLAGS="$LDFLAGS -lXft -lfreetype" fi [ -n "$USE_XINERAMA" ] && CFLAGS="$CFLAGS -DHAVE_XINERAMA"