snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

fookb: Remove --enable-wmaker compile-time option.

Browse source 
Now that we use libdockapp's --windowed option to allow users to choose
whether to run fookb as a dockapp or as a normal windowed application at
runtime, the --enable-wmaker option compile time option did very little.

In particular, it used a config file in ~/GNUstep/Defaults and it printed
a warning message when users used large icon files.

We now use the ~/.fookb config file in all instances and always print the
warning message.
This commit is contained in:
Doug Torrance 2017-09-09 21:24:28 -04:00 committed by Carlos R. Mafra
parent bc767d15bb
commit 87d2d31e5d
3 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fookb/configure.ac
View file

@ -19,21 +19,4 @@ PKG_CHECK_MODULES([libXpm], [xpm])
PKG_CHECK_MODULES([WUtil], [WUtil]) PKG_CHECK_MODULES([WUtil], [WUtil])
PKG_CHECK_MODULES([libdockapp], [dockapp]) PKG_CHECK_MODULES([libdockapp], [dockapp])
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
]
)
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)

8
fookb/images.c
View file

@ -47,11 +47,9 @@ static int get_one_image(char *name, int index, Display *dpy)
lputs("FATAL: Icon1 has zero width!"); lputs("FATAL: Icon1 has zero width!");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef WMAKER
if (w > 64) { if (w > 64) {
lputs("Warning: Icon width is more than 64. Strange things may happen."); lputs("Warning: Icon width is more than 64. Strange things may happen if using Window Maker.");
} }
#endif
} }
if (0 == h) { if (0 == h) {
@ -60,11 +58,9 @@ static int get_one_image(char *name, int index, Display *dpy)
lputs("FATAL: Icon1 had zero height!"); lputs("FATAL: Icon1 had zero height!");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef WMAKER
if (h > 64) { if (h > 64) {
lputs("Warning: Icon height is more than 64. Strange things may happen."); lputs("Warning: Icon height is more than 64. Strange things may happen if using Window Maker.");
} }
#endif
} }
if (w != stupid_picture[index]->width) { if (w != stupid_picture[index]->width) {

4
fookb/params.h
View file

@ -9,11 +9,7 @@
#define PARAMS_H #define PARAMS_H
#ifdef WMAKER
#define DEFAULTS_FILE "~/GNUstep/Defaults/FOOkb"
#else
#define DEFAULTS_FILE "~/.fookb" #define DEFAULTS_FILE "~/.fookb"
#endif /* WMAKER */
char *read_param(char *); char *read_param(char *);