diff options
| author | James Bursa <james@netsurf-browser.org> | 2004-07-28 23:07:52 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2004-07-28 23:07:52 +0000 |
| commit | 0f7e16c04ffa20d740883dcb930bc56d4530a0ae (patch) | |
| tree | 9077a0fc8cdc31a0794a78810aaf7a10d037a79f /desktop | |
| parent | b65c4d410229b65f5c0e421bc53d4c041608f91e (diff) | |
| download | netsurf-0f7e16c04ffa20d740883dcb930bc56d4530a0ae.tar.gz netsurf-0f7e16c04ffa20d740883dcb930bc56d4530a0ae.tar.bz2 | |
[project @ 2004-07-28 23:07:52 by bursa]
Implement gui_init2() and move RISC OS-specific code in main() to it. Use intro page if option_homepage_url is "".
svn path=/import/netsurf/; revision=1158
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/gui.h | 1 | ||||
| -rw-r--r-- | desktop/netsurf.c | 29 |
2 files changed, 4 insertions, 26 deletions
diff --git a/desktop/gui.h b/desktop/gui.h index be1686510..fbb4f8525 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -26,6 +26,7 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET, #include "netsurf/desktop/browser.h" void gui_init(int argc, char** argv); +void gui_init2(void); void gui_multitask(void); void gui_poll(bool active); void gui_quit(void); diff --git a/desktop/netsurf.c b/desktop/netsurf.c index befa82d67..5f12f74fd 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -14,11 +14,6 @@ #include "netsurf/utils/config.h" #include "netsurf/content/fetch.h" #include "netsurf/content/fetchcache.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" @@ -40,26 +35,7 @@ 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); - } - } + netsurf_init(argc, argv); while (!netsurf_quit) netsurf_poll(); @@ -86,7 +62,7 @@ void netsurf_init(int argc, char** argv) LOG(("version '%s'", netsurf_version)); if (uname(&utsname) != 0) - LOG(("Failed to extract machine information\n")); + LOG(("Failed to extract machine information")); else LOG(("NetSurf on <%s>, node <%s>, release <%s>, version <%s>, " "machine <%s>", utsname.sysname, @@ -99,6 +75,7 @@ void netsurf_init(int argc, char** argv) setlocale(LC_ALL, ""); fetch_init(); fetchcache_init(); + gui_init2(); } /** |