From 279eb3c3fe45541afe41f3d4580818a19938af22 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 9 Sep 2017 21:24:24 -0400 Subject: [PATCH] Remove trailing whitespace. --- buttonmaker/autogen.sh | 6 +++--- buttonmaker/src/Makefile.am | 2 +- buttonmaker/src/wmgeneral.c | 4 ++-- buttonmaker/src/wmgeneral.h | 4 ++-- fookb/ChangeLog | 6 +++--- fookb/configure.ac | 4 ++-- fookb/fookb.1x | 8 ++++---- fookb/fookb.c | 6 +++--- fookb/fookb.h | 2 +- fookb/images.c | 2 +- fookb/images.h | 2 +- fookb/opts.h | 2 +- fookb/params.c | 2 +- fookb/xrmdb.h | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/buttonmaker/autogen.sh b/buttonmaker/autogen.sh index d4437e3..bb3fc46 100755 --- a/buttonmaker/autogen.sh +++ b/buttonmaker/autogen.sh @@ -30,7 +30,7 @@ fi (grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && { (intltoolize --version) < /dev/null > /dev/null 2>&1 || { - echo + echo echo "**Error**: You must have \`intltool' installed." echo "You can get it from:" echo " ftp://ftp.gnome.org/pub/GNOME/" @@ -102,7 +102,7 @@ xlc ) esac for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print` -do +do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then echo skipping $dr -- flagged as no auto-gen @@ -129,7 +129,7 @@ do xml-i18n-toolize --copy --force --automake fi if grep "^LT_INIT" configure.ac >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then + if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." libtoolize --force --copy fi diff --git a/buttonmaker/src/Makefile.am b/buttonmaker/src/Makefile.am index 0e59945..3bafac6 100644 --- a/buttonmaker/src/Makefile.am +++ b/buttonmaker/src/Makefile.am @@ -17,7 +17,7 @@ buttonmaker_SOURCES = \ main.c \ wmgeneral.c -buttonmaker_LDFLAGS = +buttonmaker_LDFLAGS = buttonmaker_LDADD = \ $(BUTTONMAKER_LIBS) \ diff --git a/buttonmaker/src/wmgeneral.c b/buttonmaker/src/wmgeneral.c index 6235b92..fd0233c 100644 --- a/buttonmaker/src/wmgeneral.c +++ b/buttonmaker/src/wmgeneral.c @@ -6,12 +6,12 @@ ButtonMaker is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + ButtonMaker is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/buttonmaker/src/wmgeneral.h b/buttonmaker/src/wmgeneral.h index 86c4e4c..902e80d 100644 --- a/buttonmaker/src/wmgeneral.h +++ b/buttonmaker/src/wmgeneral.h @@ -6,12 +6,12 @@ ButtonMaker is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + ButtonMaker is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/fookb/ChangeLog b/fookb/ChangeLog index fcddaf1..de3e476 100644 --- a/fookb/ChangeLog +++ b/fookb/ChangeLog @@ -45,11 +45,11 @@ Small error in Makefine.in for non-proplist version was fixed. 2.1-unstable libPropList-free version. Command line parameters. X resource -management. ``configure'' script. I hope non-WindowMaker version still +management. ``configure'' script. I hope non-WindowMaker version still work? 0.9 -New icons for Xkb groups. Nasty bug was fixed: fookb plays sound twice +New icons for Xkb groups. Nasty bug was fixed: fookb plays sound twice if you change locked Xkb group with mouse. Documentation updates. 0.8 Fookb now can play sounds. @@ -60,7 +60,7 @@ No more #define NUMG 0.5 XpmReadFileToImage error check added. 0.4 -No more ass. Window Maker support happened. I hope fookb still work +No more ass. Window Maker support happened. I hope fookb still work w/o -DWMAKER. 0.3 The ass. Intended to be Window Maker support. diff --git a/fookb/configure.ac b/fookb/configure.ac index 6106f92..ef0f509 100644 --- a/fookb/configure.ac +++ b/fookb/configure.ac @@ -21,14 +21,14 @@ PKG_CHECK_MODULES([WUtil], [WUtil]) AC_ARG_ENABLE( [wmaker], [ --enable-wmaker create windowmaker dockable application], - [ + [ if test $enable_wmaker = yes ; then AC_DEFINE(WMAKER) fi ], [ AC_CHECK_PROG(HAVE_WMAKER, wmaker, yes, no) - + if test $HAVE_WMAKER = yes ; then AC_DEFINE(WMAKER) fi diff --git a/fookb/fookb.1x b/fookb/fookb.1x index d093bcf..9729c6a 100644 --- a/fookb/fookb.1x +++ b/fookb/fookb.1x @@ -21,7 +21,7 @@ mouse-clicks to change Xkb locked group with mouse. Additionally, was written from scratch. .P To use \fBfookb\fP with the Window Maker Dock, simply drag the -\fBfookb\fP icon to the Window Maker Dock (if \fBfookb\fP was compiled +\fBfookb\fP icon to the Window Maker Dock (if \fBfookb\fP was compiled with Window Maker support). .SH OPTIONS @@ -67,13 +67,13 @@ XPM file contains an icon for "broken Xkb". Please look in BUGS section. .TP .B Sound (Yes|No) -\fBfookb\fP will run command from "Command" value (see below), if this -parameter is set to "Yes". You'll receive (non-fatal) error message if +\fBfookb\fP will run command from "Command" value (see below), if this +parameter is set to "Yes". You'll receive (non-fatal) error message if this parameter is not defined. In any other case command will not be run. .TP .B Command command_to_run -This command will be run if XKB locked group is changed and "Sound" is +This command will be run if XKB locked group is changed and "Sound" is set to "Yes". .SH X resources diff --git a/fookb/fookb.c b/fookb/fookb.c index 6c22a49..7535214 100644 --- a/fookb/fookb.c +++ b/fookb/fookb.c @@ -83,7 +83,7 @@ int main(int argc, register char *argv[]) */ XrmInitialize(); /* We should initialize X resource - manager before doing something else + manager before doing something else */ ParseOptions(&argc, argv); /* We should parse command line @@ -126,8 +126,8 @@ int main(int argc, register char *argv[]) XkbGroupLockMask)) { sterror("Cannot XkbSelectEventDetails. It's your problem -- not mine."); exit(EXIT_FAILURE); - } /* Select XkbStateNotify/XkbgroupLock */ - + } /* Select XkbStateNotify/XkbgroupLock */ + read_images(dpy); /* Let's read icon images */ /* Run out! */ diff --git a/fookb/fookb.h b/fookb/fookb.h index 571d44d..cd4d326 100644 --- a/fookb/fookb.h +++ b/fookb/fookb.h @@ -1,6 +1,6 @@ /* * fookb.h - * + * * (c) 1998-2004 Alexey Vyskubov * */ diff --git a/fookb/images.c b/fookb/images.c index 54b4e69..d052a30 100644 --- a/fookb/images.c +++ b/fookb/images.c @@ -150,7 +150,7 @@ void read_images(Display *dpy) void update_window(Window win, GC gc, unsigned int whattodo, Display *dpy) { int err; - + err = XPutImage(dpy, win, gc, stupid_picture[whattodo], 0, 0, 0, 0, w, h); diff --git a/fookb/images.h b/fookb/images.h index 29d1b93..372aae1 100644 --- a/fookb/images.h +++ b/fookb/images.h @@ -1,6 +1,6 @@ /* * images.h - * + * * (c) 1998-2004 Alexey Vyskubov */ diff --git a/fookb/opts.h b/fookb/opts.h index 2ffbc5d..b077bde 100644 --- a/fookb/opts.h +++ b/fookb/opts.h @@ -11,7 +11,7 @@ /* X Window resource management */ #include #include -extern XrmDatabase cmdlineDB; /* Database for resources from command +extern XrmDatabase cmdlineDB; /* Database for resources from command line */ extern XrmDatabase finalDB; /* Database for resources from other diff --git a/fookb/params.c b/fookb/params.c index b974246..c993f03 100644 --- a/fookb/params.c +++ b/fookb/params.c @@ -19,7 +19,7 @@ char *read_param(char *string) char *newstring; char *newString; char *result; - + /* Let's make lint happy */ xvalue.size = 0; diff --git a/fookb/xrmdb.h b/fookb/xrmdb.h index 072230b..d57d57e 100644 --- a/fookb/xrmdb.h +++ b/fookb/xrmdb.h @@ -1,4 +1,4 @@ -extern XrmDatabase cmdlineDB; /* Database for resources from command +extern XrmDatabase cmdlineDB; /* Database for resources from command line */ extern XrmDatabase finalDB; /* Database for resources from other