From 8c72bcdb976d87e150a19e007180835919b6aa3a Mon Sep 17 00:00:00 2001 From: "mathias.gumz" Date: Fri, 20 Apr 2007 07:03:32 +0000 Subject: [PATCH] * small fixes in SConstruct, typo --HG-- extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4065 --- CHANGELOG.txt | 5 ++++- SConstruct | 3 ++- configure | 2 +- src/SConscript | 1 + src/alock.c | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 59169c5..d909ce3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,9 @@ Version 1.0 ---------------------------------------------------------------------- -2006-03-02: +2007-04-20: + * small fixes in SConstruct + +2007-03-02: * renamed Makefile to GNUmakefile (so using bsdmake wont hurt) * *bsd has no shadow.h support, so we wont use it on *bsd * pam doesnt need -lpam_misc on *bsd diff --git a/SConstruct b/SConstruct index 4cd391b..d860fbc 100644 --- a/SConstruct +++ b/SConstruct @@ -160,9 +160,10 @@ if alock_env['imlib2']: alock_env.AppendUnique( CPPDEFINES = [ 'HAVE_IMLIB2' ], LIBPATH = imlib2_env.Dictionary()['LIBPATH'], - CPPAPTH = imlib2_env.Dictionary()['CPPPATH'], + CPPPATH = imlib2_env.Dictionary()['CPPPATH'], LIBS = imlib2_env.Dictionary()['LIBS'] ) + conf.Finish() if alock_env['xrender']: diff --git a/configure b/configure index a9fbef0..b28c8e8 100755 --- a/configure +++ b/configure @@ -399,6 +399,6 @@ check_xlogo16 echo "#_______________________" >&4 echo "" >&4 -true +rm -fr tmp.c # vim:ft=sh diff --git a/src/SConscript b/src/SConscript index 02224e4..65b331e 100644 --- a/src/SConscript +++ b/src/SConscript @@ -15,6 +15,7 @@ Import('alock_env') build = alock_env.Copy() + if build['passwd']: auth_sources += [ 'auth_passwd.c' ] if build['hash']: diff --git a/src/alock.c b/src/alock.c index 580dc7c..dcd9b62 100644 --- a/src/alock.c +++ b/src/alock.c @@ -26,7 +26,7 @@ globals \*------------------------------------------------------------------*/ extern struct aAuth alock_auth_none; -#ifdef HAVE_HASH +#ifdef HAVE_HASH extern struct aAuth alock_auth_md5; extern struct aAuth alock_auth_sha1; extern struct aAuth alock_auth_sha256; @@ -155,6 +155,7 @@ static int event_loop(struct aOpts* opts, struct aXInfo* xinfo) { long timeout = 0; for(;;) { + XNextEvent(xinfo->display, &ev); switch (ev.type) { case KeyPress: