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

Fixed WPrefs.app to find its icons when not installed under GNUstep paths

Browse Source
This commit is contained in:
dan
2005-07-17 19:16:46 +00:00
parent f3a960d9d8
commit d26f18505a
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -4,6 +4,7 @@ Changes since version 0.92.0:
- added check for --with-gnustepdir option to configure to verify that its - added check for --with-gnustepdir option to configure to verify that its
argument is an absolute path argument is an absolute path
- updated german translations (Torsten Marek <shlomme@gmx.net>) - updated german translations (Torsten Marek <shlomme@gmx.net>)
- fixed WPrefs.app to find its icons when not installed under GNUstep paths
Changes since version 0.91.0: Changes since version 0.91.0:

4
WINGs/Makefile.am
View File

@@ -108,12 +108,12 @@ libWUtil_a_SOURCES = \
wutil.c wutil.c
AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
AM_CFLAGS = @NOSTRICTALIASING@ AM_CFLAGS = @NOSTRICTALIASING@
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG @XFTFLAGS@ @HEADER_SEARCH_PATH@
wcolorpanel.o: wcolorpanel.c wcolorpanel.o: wcolorpanel.c

1
WINGs/wapplication.c
View File

@@ -181,7 +181,6 @@ WMPathForResourceOfType(char *resource, char *ext)
return path; return path;
} }
if (getenv("GNUSTEP_SYSTEM_ROOT")) { if (getenv("GNUSTEP_SYSTEM_ROOT")) {
path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource); path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
if (path) { if (path) {

2
WPrefs.app/Makefile.am
View File

@@ -42,7 +42,7 @@ WPrefs_SOURCES = \
imagebrowser.h \ imagebrowser.h \
xmodifier.c xmodifier.c
AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
AM_CFLAGS = @NOSTRICTALIASING@ AM_CFLAGS = @NOSTRICTALIASING@

16
WPrefs.app/main.c
View File

@@ -100,7 +100,7 @@ main(int argc, char **argv)
{ {
Display *dpy; Display *dpy;
WMScreen *scr; WMScreen *scr;
char *locale; char *locale, *path;
int i; int i;
char *display_name=""; char *display_name="";
@@ -110,6 +110,20 @@ main(int argc, char **argv)
WMInitializeApplication("WPrefs", &argc, argv); WMInitializeApplication("WPrefs", &argc, argv);
WMSetResourcePath(RESOURCE_PATH);
path = WMPathForResourceOfType("WPrefs.tiff", NULL);
if (!path) {
/* maybe it is run directly from the source directory */
WMSetResourcePath(".");
path = WMPathForResourceOfType("WPrefs.tiff", NULL);
if (!path) {
WMSetResourcePath("..");
}
}
if (path) {
wfree(path);
}
if (argc>1) { if (argc>1) {
for (i=1; i<argc; i++) { for (i=1; i<argc; i++) {
if (strcmp(argv[i], "-version")==0 if (strcmp(argv[i], "-version")==0