eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Michael Drake 2012-07-21 13:13:57 +01:00
parent a2dadbbe12
commit 5fc781d715
5 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Docs/PACKAGING-GTK
View File

@ -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.

2
Makefile.defaults
View File

@ -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

13
riscos/gui.c
View File

@ -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);

9
riscos/iconbar.c
View File

@ -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;

7
riscos/window.c
View File

@ -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);
}
}