diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-06-19 16:29:42 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-21 23:27:22 +0100 |
| commit | 67ded2a02a4f3f4d2a0ab156f3343dc93f4ba04c (patch) | |
| tree | 3110af1e6d0bea57725b74db6efeb3a821628890 /amiga | |
| parent | 335bbe4f52b9fdb74e377b83906eaab4456666cf (diff) | |
| download | netsurf-67ded2a02a4f3f4d2a0ab156f3343dc93f4ba04c.tar.gz netsurf-67ded2a02a4f3f4d2a0ab156f3343dc93f4ba04c.tar.bz2 | |
This moves message loading out of netsurf_init into each frontend
The translated message loading is dependant on configuration of
resource location in each frontend, additionally they should have the
ability to deal with errors in this loading in a implementation
specific manner.
This also extends the message loading API to be capable of loading
from an inline memory buffer instead of from a file.
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/gui.c | 4 | ||||
| -rw-r--r-- | amiga/theme.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index f0132f37e..5c671e1e2 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5499,7 +5499,9 @@ int main(int argc, char** argv) return RETURN_FAIL; } - ret = netsurf_init(messages, current_user_cache); + ret = messages_add_from_file(messages); + + ret = netsurf_init(current_user_cache); if (ret != NSERROR_OK) { ami_misc_fatal_error("NetSurf failed to initialise"); return RETURN_FAIL; diff --git a/amiga/theme.c b/amiga/theme.c index 4d6107ab4..0b77dc560 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -152,7 +152,7 @@ void ami_theme_init(void) if(lock) { UnLock(lock); - messages_load(themefile); + messages_add_from_file(themefile); } } |