diff options
-rw-r--r-- | Docs/PACKAGING-GTK | 4 | ||||
-rw-r--r-- | Makefile.defaults | 2 | ||||
-rw-r--r-- | riscos/gui.c | 13 | ||||
-rw-r--r-- | riscos/iconbar.c | 9 | ||||
-rw-r--r-- | riscos/window.c | 7 |
5 files changed, 11 insertions, 24 deletions
diff --git a/Docs/PACKAGING-GTK b/Docs/PACKAGING-GTK index 5453dff3f..67e63b231 100644 --- a/Docs/PACKAGING-GTK +++ b/Docs/PACKAGING-GTK @@ -74,8 +74,8 @@ =============== If the user hasn't specified a home page URL in their Preferences, NetSurf - defaults to a "portal" welcome page on http://www.netsurf-browser.org/ - if - you wish to change this, you can do so by editing NETSURF_HOMEPAGE in + defaults to a "portal" welcome page at about:netsurf - if you wish to + change this, you can do so by overriding the NETSURF_HOMEPAGE URL in Makefile.config. diff --git a/Makefile.defaults b/Makefile.defaults index 8995a7271..1fdb42552 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -86,7 +86,7 @@ NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s)" # option does not apply to the RISC OS version, as it has its own local # home page, and it can be changed by editing the end of gui_init2() in # riscos/gui.c -NETSURF_HOMEPAGE := "http://www.netsurf-browser.org/welcome/" +NETSURF_HOMEPAGE := "about:welcome" # Force using glibc internal iconv implementation instead of external libiconv # Valid options: YES, NO diff --git a/riscos/gui.c b/riscos/gui.c index 11f4e1df7..945f93770 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -761,13 +761,11 @@ static void gui_init2(int argc, char** argv) } /* default homepage */ else { - url = calloc(80, sizeof(char)); + url = strdup(NETSURF_HOMEPAGE); if (!url) { LOG(("malloc failed")); die("Insufficient memory for URL"); } - snprintf(url, 80, "file:///<NetSurf$Dir>/Docs/welcome/index_%s", - nsoption_charp(language)); } if (open_window) @@ -1825,14 +1823,11 @@ void ro_msg_dataopen(wimp_message *message) if (len < 9 || strcmp(".!NetSurf", message->data.data_xfer.file_name + len - 9)) return; - if (nsoption_charp(homepage_url) && nsoption_charp(homepage_url)[0]) { + if (nsoption_charp(homepage_url) && + nsoption_charp(homepage_url)[0]) { url = strdup(nsoption_charp(homepage_url)); } else { - url = malloc(80); - if (url) - snprintf(url, 80, - "file:///<NetSurf$Dir>/Docs/welcome/index_%s", - nsoption_charp(language)); + url = strdup(NETSURF_HOMEPAGE); } if (!url) warn_user("NoMemory", 0); diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 9e3a050e1..0aa591a45 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -117,19 +117,16 @@ void ro_gui_iconbar_initialise(void) bool ro_gui_iconbar_click(wimp_pointer *pointer) { - char url[80]; int key_down = 0; switch (pointer->buttons) { case wimp_CLICK_SELECT: if (nsoption_charp(homepage_url) != NULL) { browser_window_create(nsoption_charp(homepage_url), - NULL, 0, true, false); + NULL, 0, true, false); } else { - snprintf(url, sizeof url, - "file:///<NetSurf$Dir>/Docs/welcome/index_%s", - nsoption_charp(language)); - browser_window_create(url, NULL, 0, true, false); + browser_window_create(NETSURF_HOMEPAGE, + NULL, 0, true, false); } break; diff --git a/riscos/window.c b/riscos/window.c index 78410ac6a..8287878fe 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -3882,18 +3882,13 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url) { void ro_gui_window_action_home(struct gui_window *g) { - char url[80]; - if (g == NULL || g->bw == NULL) return; if ((nsoption_charp(homepage_url)) && (nsoption_charp(homepage_url)[0])) { browser_window_go(g->bw, nsoption_charp(homepage_url), 0, true); } else { - snprintf(url, sizeof url, - "file:///<NetSurf$Dir>/Docs/welcome/index_%s", - nsoption_charp(language)); - browser_window_go(g->bw, url, 0, true); + browser_window_go(g->bw, NETSURF_HOMEPAGE, 0, true); } } |