gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-02 22:25:48 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some problems in 0.60.0

Browse Source
This commit is contained in:
dan
1999-06-04 20:13:40 +00:00
parent a10885b99d
commit b9c1aba415
13 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/Makefile.am
View File

@@ -10,7 +10,7 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
wkdemenu.pl
INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@

2
util/Makefile.in
View File

@@ -101,7 +101,7 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c wkdemenu.pl
INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
liblist = @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@

1
util/setstyle.c
View File

@@ -374,7 +374,6 @@ main(int argc, char **argv)
int i;
int ignoreCount = 0;
char *ignoreList[MAX_OPTIONS];
int format = 0;
dpy = XOpenDisplay("");

11
util/wmsetbg.c
View File

@@ -46,9 +46,8 @@
#include "../src/wconfig.h"
#include "../WINGs/WINGs.h"
#include "../WINGs/WUtil.h"
#include "../wrlib/wraster.h"
#include <WINGs.h>
#include <wraster.h>
#include <proplist.h>
@@ -529,7 +528,6 @@ parseTexture(RContext *rc, char *text)
image = loadImage(rc, file);
if (!image) {
RDestroyImage(gradient);
goto error;
}
@@ -557,7 +555,8 @@ parseTexture(RContext *rc, char *text)
if (!gradient) {
wwarning("could not render texture:%s",
RMessageForError(RErrorCode));
RDestroyImage(gradient);
RDestroyImage(gradient);
RDestroyImage(image);
goto error;
}
@@ -577,7 +576,7 @@ parseTexture(RContext *rc, char *text)
if (!RConvertImage(rc, tiled, &pixmap)) {
wwarning("could not convert texture:%s",
RMessageForError(RErrorCode));
RDestroyImage(image);
RDestroyImage(tiled);
goto error;
}
texture->width = tiled->width;