mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 21:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Take the easy way out wrt loading messages files: leave it to the RISC OS frontend to do this.

Browse Source 
svn path=/trunk/netsurf/; revision=10374
This commit is contained in:
John Mark Bell 2010-04-11 22:40:41 +00:00
parent 4b8c720ac5
commit 9e8849c04c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/netsurf.c
View File

@ -111,8 +111,10 @@ nserror netsurf_init(int *pargc,
LOG(("Using '%s' for Options file", options));
options_read(options);
LOG(("Using '%s' as Messages file", messages));
messages_load(messages);
if (messages != NULL) {
LOG(("Using '%s' as Messages file", messages));
messages_load(messages);
}
lwc_initialise(netsurf_lwc_alloc, NULL, 0);

9
riscos/gui.c
View File

@ -747,9 +747,13 @@ static void gui_init2(int argc, char** argv)
/** Normal entry point from OS */
int main(int argc, char** argv)
{
char path[40];
int length;
setbuf(stderr, NULL);
#if RISCOS_MESSAGES_CHOICE
netsurf_init(&argc, &argv, "NetSurf:Choices", NULL);
/* Choose the interface language to use */
ro_gui_choose_language();
@ -760,9 +764,6 @@ int main(int argc, char** argv)
die("Failed to locate Messages resource.");
messages_load(path);
messages_load("NetSurf:Resources.LangNames");
#endif
netsurf_init(&argc, &argv, "NetSurf:Choices", messages);
gui_init(argc, argv);