1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00

Miscellaneous fixes from OpenSuse

These are some of the fixes sent to the wmaker-dev list by
Vladimir Nadvornik, with minor modifications to address Dan
Pascu's concerns.

Original-post: http://lists.windowmaker.info/dev/msg00293.html
This commit is contained in:
Vladimir Nadvornik
2009-02-17 11:55:33 +01:00
committed by Carlos R. Mafra
parent 6d75291e1d
commit 108127f0b5
6 changed files with 15 additions and 8 deletions

View File

@@ -8,7 +8,7 @@
WMWindow *win; WMWindow *win;
WMButton *Button[MAX_SIZE]; WMButton *Button[MAX_SIZE];
char Map[MAX_SIZE]; signed char Map[MAX_SIZE];
int Size = 4; int Size = 4;
int MoveCount; int MoveCount;

View File

@@ -28,6 +28,9 @@
# endif # endif
#endif #endif
#ifndef __GNUC__
#define __attribute__(x) /*NOTHING*/
#endif
#ifdef NDEBUG #ifdef NDEBUG
@@ -216,11 +219,11 @@ waborthandler* wsetabort(waborthandler* handler);
/* don't free the returned string */ /* don't free the returned string */
char* wstrerror(int errnum); char* wstrerror(int errnum);
void wmessage(const char *msg, ...); void wmessage(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wwarning(const char *msg, ...); void wwarning(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wfatal(const char *msg, ...); void wfatal(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wsyserror(const char *msg, ...); void wsyserror(const char *msg, ...) __attribute__((__format__(printf,1,2)));
void wsyserrorwithcode(int error, const char *msg, ...); void wsyserrorwithcode(int error, const char *msg, ...) __attribute__((__format__(printf,2,3)));
char* wfindfile(char *paths, char *file); char* wfindfile(char *paths, char *file);

View File

@@ -1160,7 +1160,7 @@ static void readConfiguration(W_ColorPanel * panel)
} }
if (!(dPtr = opendir(panel->configurationPath))) { if (!(dPtr = opendir(panel->configurationPath))) {
wwarning(_("Color Panel: Could not find file"), "%s", panel->configurationPath); wwarning("%s: %s", _("Color Panel: Could not find file"), panel->configurationPath);
return; return;
} }
@@ -3439,6 +3439,7 @@ RColor ulongToRColor(WMScreen * scr, unsigned long value)
color.red = 0; color.red = 0;
color.green = 0; color.green = 0;
color.blue = 0; color.blue = 0;
color.alpha = 0;
return color; return color;
} }
@@ -3448,6 +3449,7 @@ RColor ulongToRColor(WMScreen * scr, unsigned long value)
color.red = xcolor->red >> 8; color.red = xcolor->red >> 8;
color.green = xcolor->green >> 8; color.green = xcolor->green >> 8;
color.blue = xcolor->blue >> 8; color.blue = xcolor->blue >> 8;
color.alpha = 0;
wfree(xcolor); wfree(xcolor);

View File

@@ -22,6 +22,7 @@
#include "wconfig.h" #include "wconfig.h"
#include <stdlib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>

View File

@@ -178,7 +178,7 @@ Bool wXDNDProcessSelection(XEvent * event)
wfree(scr->xdestring); /* this xdestring is not from Xlib (no XFree) */ wfree(scr->xdestring); /* this xdestring is not from Xlib (no XFree) */
} }
/* why doesn't this function return anything ? -Dan */ return True;
} }
Bool isAwareXDND(Window window) Bool isAwareXDND(Window window)

View File

@@ -20,6 +20,7 @@
#if 1 #if 1
int main() int main()
{ {
return 0;
} }
#else #else
#define PROG_VERSION "wmsetup 0.0 (Window Maker)" #define PROG_VERSION "wmsetup 0.0 (Window Maker)"