From 3bb15c459f86d85c653fd6369b3fd621c10c3515 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 15 Jul 2012 18:04:15 +0100 Subject: Update docs for Git. --- Docs/BUILDING-Cocoa | 2 +- Docs/BUILDING-Framebuffer | 2 +- Docs/BUILDING-GTK | 2 +- Docs/BUILDING-Monkey | 2 +- Docs/BUILDING-Windows | 2 +- Docs/LIBRARIES | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Docs') diff --git a/Docs/BUILDING-Cocoa b/Docs/BUILDING-Cocoa index 7bfac2937..31a58ee81 100644 --- a/Docs/BUILDING-Cocoa +++ b/Docs/BUILDING-Cocoa @@ -27,7 +27,7 @@ The remainder must be installed manually. Currently, some of the libraries developed as part of the NetSurf project have not had official releases. Hopefully they will soon be released with downloadable tarballs and packaged - in common distros. For now, you'll have to make do with svn checkouts. + in common distros. For now, you'll have to make do with Git checkouts. Package installation ---------------------- diff --git a/Docs/BUILDING-Framebuffer b/Docs/BUILDING-Framebuffer index 7cddc7e74..4eb993f13 100644 --- a/Docs/BUILDING-Framebuffer +++ b/Docs/BUILDING-Framebuffer @@ -211,7 +211,7 @@ Index: framebuffer/font_freetype.c The remainder must be installed manually. Currently, some of the libraries developed as part of the NetSurf project have not had official releases. Hopefully they will soon be released with downloadable tarballs and packaged - in common distros. For now, you'll have to make do with svn checkouts. + in common distros. For now, you'll have to make do with Git checkouts. Package installation ---------------------- diff --git a/Docs/BUILDING-GTK b/Docs/BUILDING-GTK index b01dbf021..2749bf4ec 100644 --- a/Docs/BUILDING-GTK +++ b/Docs/BUILDING-GTK @@ -51,7 +51,7 @@ The remainder must be installed manually. Currently, some of the libraries developed as part of the NetSurf project have not had official releases. Hopefully they will soon be released with downloadable tarballs and packaged - in common distros. For now, you'll have to make do with svn checkouts. + in common distros. For now, you'll have to make do with Git checkouts. Some of NetSurf's own libraries will be installed in /usr/local/ by default. Fedora, and perhaps some other distributions of Linux, do not ship a diff --git a/Docs/BUILDING-Monkey b/Docs/BUILDING-Monkey index aa77f99ec..b467c7c15 100644 --- a/Docs/BUILDING-Monkey +++ b/Docs/BUILDING-Monkey @@ -47,7 +47,7 @@ The remainder must be installed manually. Currently, some of the libraries developed as part of the NetSurf project have not had official releases. Hopefully they will soon be released with downloadable tarballs and packaged - in common distros. For now, you'll have to make do with svn checkouts. + in common distros. For now, you'll have to make do with Git checkouts. Some of NetSurf's own libraries will be installed in /usr/local/ by default. Fedora, and perhaps some other distributions of Linux, do not ship a diff --git a/Docs/BUILDING-Windows b/Docs/BUILDING-Windows index 55dfcfdfd..10454b9b2 100644 --- a/Docs/BUILDING-Windows +++ b/Docs/BUILDING-Windows @@ -204,7 +204,7 @@ EOF ----------- The windows resources may be rebuilt. Currently there is 1 object - file included in the svn distribution of NetSurf that could be + file included in the Git distribution of NetSurf that could be manually compiled $ cd windows/res diff --git a/Docs/LIBRARIES b/Docs/LIBRARIES index f6292809d..dc5a98048 100644 --- a/Docs/LIBRARIES +++ b/Docs/LIBRARIES @@ -30,7 +30,7 @@ Required: - $ git clone git://git.netsurf-browser.org/pencil + $ git clone git://git.netsurf-browser.org/libpencil $ git clone git://git.netsurf-browser.org/rufl -- cgit v1.2.3 From 82fe8989aefa072215d223cf92a1a1e7e7e7228a Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 16 Jul 2012 14:28:08 +0100 Subject: Remove reference to robuild web page. --- Docs/BUILDING-RISC_OS | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Docs') diff --git a/Docs/BUILDING-RISC_OS b/Docs/BUILDING-RISC_OS index 5c4c3d531..7e61bd22f 100644 --- a/Docs/BUILDING-RISC_OS +++ b/Docs/BUILDING-RISC_OS @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - Build Instructions for RISC OS NetSurf 16 January 2010 + Build Instructions for RISC OS NetSurf 16 July 2012 -------------------------------------------------------------------------------- This document provides instructions for building the RISC OS NetSurf @@ -16,11 +16,6 @@ | + Perl 5.8.8 or later | + GCC 3.4.6 release 3 or later | + The latest NSTools - | - | For instructions on how to do all of the above, consult the following - | document: - | - | http://www.netsurf-browser.org/documentation/robuild If you want to cross-compile NetSurf for RISC OS, use the BUILDING-ROCross document. -- cgit v1.2.3 From 5fc781d715cab48f03fb4d72558d35f65c6528c3 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 21 Jul 2012 13:13:57 +0100 Subject: Update default homepage URL to about:welcome. Make RISC OS front end use NETSURF_HOMEPAGE too. Currently only the English welcome page will be fetched. Need to add language negotiation to choose best language option. --- Docs/PACKAGING-GTK | 4 ++-- Makefile.defaults | 2 +- riscos/gui.c | 13 ++++--------- riscos/iconbar.c | 9 +++------ riscos/window.c | 7 +------ 5 files changed, 11 insertions(+), 24 deletions(-) (limited to 'Docs') 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:////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:////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:////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:////Docs/welcome/index_%s", - nsoption_charp(language)); - browser_window_go(g->bw, url, 0, true); + browser_window_go(g->bw, NETSURF_HOMEPAGE, 0, true); } } -- cgit v1.2.3