gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-10 18:45:47 +01:00
Code Issues Projects Releases Wiki Activity

- Fixed some compilation problems, which could lead to sigsegv at run time in

Browse Source 
the new 'bag' code.
- Fixed PPosition problem.
This commit is contained in:
dan
1999-09-16 21:52:18 +00:00
parent ac4053478a
commit 8747093e64
33 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/Makefile.am
View File

@@ -45,7 +45,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
testnot_SOURCES = testnot.c
testnot_LDADD = libWINGs.a $(LIBLIST)
testnot_LDADD = libWUtil.a @LIBPL@
wmquery_SOURCES = wmquery.c

6
WINGs/Makefile.in
View File

@@ -131,7 +131,7 @@ testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
testnot_SOURCES = testnot.c
testnot_LDADD = libWINGs.a $(LIBLIST)
testnot_LDADD = libWUtil.a @LIBPL@
wmquery_SOURCES = wmquery.c
@@ -197,7 +197,7 @@ testcolorpanel_DEPENDENCIES = libWINGs.a \
$(top_builddir)/wrlib/libwraster.la
testcolorpanel_LDFLAGS =
testnot_OBJECTS = testnot.o
testnot_DEPENDENCIES = libWINGs.a $(top_builddir)/wrlib/libwraster.la
testnot_DEPENDENCIES = libWUtil.a
testnot_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -211,7 +211,7 @@ DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
TAR = tar
GZIP_ENV = --best
SOURCES = $(libWINGs_a_SOURCES) $(libWUtil_a_SOURCES) $(wtest_SOURCES) $(wmquery_SOURCES) $(wmfile_SOURCES) $(fontl_SOURCES) $(testmywidget_SOURCES) $(testcolorpanel_SOURCES) $(testnot_SOURCES)
OBJECTS = $(libWINGs_a_OBJECTS) $(libWUtil_a_OBJECTS) $(wtest_OBJECTS) $(wmquery_OBJECTS) $(wmfile_OBJECTS) $(fontl_OBJECTS) $(testmywidget_OBJECTS) $(testcolorpanel_OBJECTS) $(testnot_OBJECTS)

2
WINGs/Resources/Makefile.in
View File

@@ -104,7 +104,7 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:

2
WINGs/WUtil.h
View File

@@ -258,7 +258,7 @@ int WMCountInBag(WMBag *bag, void *item);
* > 0 if a > b
* = 0 if a = b
*/
void WMSortBag(WMBag *bag, int (*comparer)(void*,void*));
void WMSortBag(WMBag *bag, int (*comparer)(const void*, const void*));
void WMEmptyBag(WMBag *bag);

2
WINGs/bag.c
View File

@@ -157,7 +157,7 @@ WMCountInBag(WMBag *bag, void *item)
void
WMSortBag(WMBag *bag, int (*comparer)(void*, void*))
WMSortBag(WMBag *bag, int (*comparer)(const void*, const void*))
{
qsort(bag->items, bag->count, sizeof(void*), comparer);
}

4
WINGs/notification.c
View File

@@ -440,7 +440,7 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue,
for (i = 0; i < WMGetBagItemCount(queue->asapQueue); i++) {
tmp = WMGetFromBag(queue->asapQueue, i);
if (strcmp(notification->name, tmp) == 0) {
if (strcmp(notification->name, tmp->name) == 0) {
WMRemoveFromBag(queue->asapQueue, tmp);
WMReleaseNotification(tmp);
break;
@@ -449,7 +449,7 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue,
for (i = 0; i < WMGetBagItemCount(queue->idleQueue); i++) {
tmp = WMGetFromBag(queue->idleQueue, i);
if (strcmp(notification->name, tmp) == 0) {
if (strcmp(notification->name, tmp->name) == 0) {
WMRemoveFromBag(queue->idleQueue, tmp);
WMReleaseNotification(tmp);
break;

2
WINGs/wfontpanel.c
View File

@@ -647,7 +647,7 @@ listFamilies(WMScreen *scr, WMFontPanel *panel)
*fontList[i] = '\0';
continue;
}
addFontToFamily(families, (char**)fields);
addFontToFamily(families, fields);
}
}

4
WINGs/wwindow.c
View File

@@ -311,12 +311,12 @@ setSizeHints(WMWindow *win)
hints->flags = 0;
if (win->flags.upos_set) {
hints->flags |= USPosition;
hints->flags |= USPosition; /* shouldn't be PPosition ? --Dan */
hints->x = win->upos.x;
hints->y = win->upos.y;
}
if (win->usize.width>0 && win->usize.height>0) {
hints->flags |= USSize;
hints->flags |= USSize; /* shouldn't be PSize ? --Dan */
hints->width = win->usize.width;
hints->height = win->usize.height;
}