diff options
author | Andrew Timmins <atimmins@blueyonder.co.uk> | 2004-07-26 20:13:45 +0000 |
---|---|---|
committer | Andrew Timmins <atimmins@blueyonder.co.uk> | 2004-07-26 20:13:45 +0000 |
commit | b59616c9ab85b0f58c0318f62e39f197932a712b (patch) | |
tree | 72e5c3ffa27800e21be5f1a7d74e97a006fc7bd6 /desktop/netsurf.c | |
parent | 8e7d298c65440ab93e8061a934c76076b934eddd (diff) | |
download | netsurf-b59616c9ab85b0f58c0318f62e39f197932a712b.tar.gz netsurf-b59616c9ab85b0f58c0318f62e39f197932a712b.tar.bz2 |
[project @ 2004-07-26 20:13:45 by atimmins]
Updated to support new config options (homepage, open on startup). Bug fixes with new config pane window (sticky selected radio icon bug!). Also includes up-to-date French templates.
svn path=/import/netsurf/; revision=1150
Diffstat (limited to 'desktop/netsurf.c')
-rw-r--r-- | desktop/netsurf.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 507840454..b38f198a1 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -4,6 +4,7 @@ * http://www.opensource.org/licenses/gpl-license * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net> * Copyright 2004 James Bursa <bursa@users.sourceforge.net> + * Copyright 2004 Andrew Timmins <atimmins@blueyonder.co.uk> */ #include <locale.h> @@ -13,7 +14,11 @@ #include "netsurf/utils/config.h" #include "netsurf/content/fetch.h" #include "netsurf/content/fetchcache.h" -#include "netsurf/desktop/options.h" +#ifdef riscos + #include "netsurf/riscos/options.h" +#else + #include "netsurf/desktop/options.h" +#endif #include "netsurf/desktop/netsurf.h" #include "netsurf/desktop/browser.h" #include "netsurf/desktop/gui.h" @@ -38,12 +43,27 @@ static void lib_init(void); int main(int argc, char** argv) { + char url[80]; + int length; + netsurf_init(argc, argv); #ifdef WITH_KIOSK_BROWSING browser_window_create("file:/<NetSurf$Dir>/Docs/Intro_En", NULL); #endif + if (option_open_browser_at_startup == true){ + if (!(option_homepage_url == NULL)){ + browser_window_create(option_homepage_url, NULL); + } + else { + if ((length = snprintf(url, sizeof(url), + "file:/<NetSurf$Dir>/Docs/intro_%s", + option_language)) >= 0 && length < (int)sizeof(url)) + browser_window_create(url, NULL); + } + } + while (!netsurf_quit) netsurf_poll(); |