eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update resource search path to remove users directory 

it is no longer suitable to search the users home directory for
 general browser resources as the correct config path is now
derived from the apropriate windows methods.

Additionaly the NETSURFRES environment variable is no longer part
 of the fixed path and is instead added from the makefile
 configuration option.
This commit is contained in:
Vincent Sanders 2019-12-10 17:50:20 +00:00
parent faf667ada7
commit 2f7de349ea
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontends/windows/Makefile.defaults
View File

@ -3,8 +3,8 @@
# ----------------------------------------------------------------------------
# Where to search for NetSurf's resources after looking in ~/.netsurf and
# $NETSURFRES. It must have a trailing backslash
NETSURF_WINDOWS_RESPATH :=
# ${APPDATA}\NetSurf. It must have a trailing backslash
NETSURF_WINDOWS_RESPATH := $${NETSURFRES}
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO

5
frontends/windows/main.c
View File

@ -375,6 +375,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
*/
nslog_init(nslog_ensure, &argc, argv);
/* build resource path string vector */
respaths = nsws_init_resource("${APPDATA}\\NetSurf:${PROGRAMFILES}\\NetSurf\\NetSurf\\:"NETSURF_WINDOWS_RESPATH);
/* Locate the correct user configuration directory path */
ret = get_config_home(&nsw32_config_home);
if (ret != NSERROR_OK) {
@ -391,8 +394,6 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd)
return 1;
}
respaths = nsws_init_resource("${APPDATA}\\NetSurf:${HOME}\\.netsurf:${NETSURFRES}:${PROGRAMFILES}\\NetSurf\\NetSurf\\:"NETSURF_WINDOWS_RESPATH);
/* Initialise translated messages */
ret = nsw32_messages_init(respaths);
if (ret != NSERROR_OK) {