gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 01:12:30 +01:00
Code Issues Projects Releases Wiki Activity

applied patch to use more gnustepish paths for some internal data files

Browse Source
This commit is contained in:
kojima
2005-03-11 01:56:06 +00:00
parent fe381eca77
commit 3301b57d4b
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
NEWS
View File

@@ -332,9 +332,10 @@ behavior regarding workspaces you can now (use WPrefs.app to do this).
Client supplied icons Client supplied icons
--------------------- ---------------------
Window Maker saves the client supplied icons in ~/GNUstep/.AppInfo/WindowMaker Window Maker saves the client supplied icons in
in XPM format for later use when the app is no longer running (to have the ~/GNUstep/Library/WindowMaker/CachedPixmaps in XPM format for later use
image to display for docked icons for example). when the app is no longer running (to have the image to display for docked
icons for example).
Until recently the XPM images saved by Window Maker were incorrect, but a Until recently the XPM images saved by Window Maker were incorrect, but a
recent fix in the code to save XPM's fixed them. But with this fix, all recent fix in the code to save XPM's fixed them. But with this fix, all
@@ -342,12 +343,12 @@ previously saved XPM's in that directory are no longer readable (they give
wrong images on screen or fail to load). wrong images on screen or fail to load).
To avoid the need for the user to fix this by hand editing WMWindowAttributes To avoid the need for the user to fix this by hand editing WMWindowAttributes
and removing all references to icons in ~/GNUstep/.AppInfo/WindowMaker which and removing all references to icons in ~/GNUstep/Library/WindowMaker/CachedPixmaps
can be annoying, new code was added to Window Maker to permit the regeneration which can be annoying, new code was added to Window Maker to permit the
of images in ~/GNUstep/.AppInfo/WindowMaker if they are missing. regeneration of images in ~/GNUstep/Library/WindowMaker/CachedPixmaps if they are missing.
With this addition, all you need to do to fix your old broken images, is to With this addition, all you need to do to fix your old broken images, is to
delete all *.xpm files from ~/GNUstep/.AppInfo/WindowMaker. Next time the delete all *.xpm files from ~/GNUstep/Library/WindowMaker/CachedPixmaps. Next time the
application that is supplying an icon image will start the icon will be application that is supplying an icon image will start the icon will be
recreated if missing, but this time it will be saved with the new XPM save recreated if missing, but this time it will be saved with the new XPM save
code which produces good XPM images. code which produces good XPM images.
@@ -1213,7 +1214,7 @@ Persistent Program Suplied Icons
Application supplied icons are now stored, so that the dock will keep Application supplied icons are now stored, so that the dock will keep
showing them after the app is exited. The icons are stored at showing them after the app is exited. The icons are stored at
~/GNUstep/.AppInfo/WindowMaker/ ~/GNUstep/Library/WindowMaker/CachedPixmaps
Sound support Sound support

3
WINGs/WINGs/WUtil.h
View File

@@ -234,9 +234,12 @@ char* wexpandpath(char *path);
char* wgethomedir(); char* wgethomedir();
void* wmalloc(size_t size); void* wmalloc(size_t size);
void* wmalloc0(size_t size);
void* wrealloc(void *ptr, size_t newsize); void* wrealloc(void *ptr, size_t newsize);
void wfree(void *ptr); void wfree(void *ptr);
#define wnew(type, count) wmalloc(sizeof(type)*count)
#define wnew0(type, count) wmalloc0(sizeof(type)*count)
void wrelease(void *ptr); void wrelease(void *ptr);
void* wretain(void *ptr); void* wretain(void *ptr);

13
WINGs/memory.c
View File

@@ -110,6 +110,19 @@ wmalloc(size_t size)
} }
void*
wmalloc0(size_t size)
{
void *ptr= wmalloc(size);
if (!ptr)
return NULL;
memset(ptr, 0, size);
return ptr;
}
void* void*
wrealloc(void *ptr, size_t newsize) wrealloc(void *ptr, size_t newsize)
{ {

2
WPrefs.app/Appearance.c
View File

@@ -1726,7 +1726,7 @@ createPanel(Panel *p)
char *tmp; char *tmp;
Bool ok = True; Bool ok = True;
panel->fprefix = wstrconcat(wusergnusteppath(), "/.AppInfo"); panel->fprefix = wstrconcat(wusergnusteppath(), "/Library/WindowMaker/WPrefs");
if (access(panel->fprefix, F_OK)!=0) { if (access(panel->fprefix, F_OK)!=0) {
if (mkdir(panel->fprefix, 0755) < 0) { if (mkdir(panel->fprefix, 0755) < 0) {