Merge branch 'master' of git://git.netsurf-browser.org/netsurf

4 files changed, 23 insertions, 45 deletions

diff --git a/riscos/gui.c b/riscos/gui.c
index 11f4e1df7..e11679b82 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);
@@ -2119,24 +2114,6 @@ void ro_gui_screen_size(int *width, int *height)
 
 
 /**
- * Opens a language sensitive help page
- *
- * \param page  the page to open
- */
-void ro_gui_open_help_page(const char *page)
-{
-	char url[80];
-	int length;
-
-	if ((length = snprintf(url, sizeof url,
-			"file:///<NetSurf$Dir>/Docs/%s_%s",
-			       page, nsoption_charp(language))) >= 0 &&
-			length < (int)sizeof(url))
-		browser_window_create(url, NULL, 0, true, false);
-}
-
-
-/**
  * Send the source of a content to a text editor.
  */
 
diff --git a/riscos/gui.h b/riscos/gui.h
index 14835274b..cd70a39a0 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -114,7 +114,6 @@ extern struct gui_window *ro_gui_current_redraw_gui;
 
 /* in gui.c */
 void ro_gui_open_window_request(wimp_open *open);
-void ro_gui_open_help_page(const char *page);
 void ro_gui_screen_size(int *width, int *height);
 void ro_gui_view_source(struct hlcache_handle *c);
 void ro_gui_dump_content(struct hlcache_handle *c);
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index 9e3a050e1..24d8661cc 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;
 
@@ -186,7 +183,9 @@ bool ro_gui_iconbar_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
 
 	switch (action) {
 	case HELP_OPEN_CONTENTS:
-		ro_gui_open_help_page("documentation/index");
+		browser_window_create(
+				"http://www.netsurf-browser.org/documentation/",
+				NULL, 0, true, false);
 		return true;
 	case BROWSER_NAVIGATE_URL:
 		ro_gui_dialog_prepare_open_url();
diff --git a/riscos/window.c b/riscos/window.c
index 78410ac6a..deae43c25 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1917,7 +1917,9 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
 
 	switch (c) {
 	case IS_WIMP_KEY + wimp_KEY_F1:	/* Help. */
-		ro_gui_open_help_page("documentation/index");
+		browser_window_create(
+				"http://www.netsurf-browser.org/documentation/",
+				NULL, 0, true, false);
 		return true;
 
 	case IS_WIMP_KEY + wimp_KEY_CONTROL + wimp_KEY_F1:
@@ -2642,13 +2644,19 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
 
 	/* help actions */
 	case HELP_OPEN_CONTENTS:
-		ro_gui_open_help_page("documentation/index");
+		browser_window_create(
+			"http://www.netsurf-browser.org/documentation/",
+			NULL, 0, true, false);
 		break;
 	case HELP_OPEN_GUIDE:
-		ro_gui_open_help_page("documentation/guide");
+		browser_window_create(
+			"http://www.netsurf-browser.org/documentation/guide",
+			NULL, 0, true, false);
 		break;
 	case HELP_OPEN_INFORMATION:
-		ro_gui_open_help_page("documentation/info");
+		browser_window_create(
+			"http://www.netsurf-browser.org/documentation/info",
+			NULL, 0, true, false);
 		break;
 	case HELP_OPEN_CREDITS:
 		browser_window_create("about:credits", NULL, 0, true, false);
@@ -3882,18 +3890,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);
 	}
 }