From a47270c93eaa7bb76638c4c6dbef23359531651c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 24 Feb 2020 14:17:58 +0000 Subject: About fetches resources: Drop maps resource. It had bitrotted. --- content/fetchers/about.c | 29 ----------- content/fetchers/resource.c | 1 - frontends/atari/Makefile | 1 - frontends/beos/Makefile | 2 +- frontends/framebuffer/Makefile | 2 +- frontends/gtk/Makefile | 2 +- frontends/gtk/res/netsurf.gresource.xml | 1 - frontends/gtk/resources.c | 1 - resources/en/maps.html | 85 --------------------------------- 9 files changed, 3 insertions(+), 121 deletions(-) delete mode 100644 resources/en/maps.html diff --git a/content/fetchers/about.c b/content/fetchers/about.c index 4b8562cac..dda8fc823 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -685,28 +685,6 @@ static bool fetch_about_welcome_handler(struct fetch_about_context *ctx) } -/** - * Handler to generate about scheme maps page - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_maps_handler(struct fetch_about_context *ctx) -{ - fetch_msg msg; - - /* content is going to return redirect */ - fetch_set_http_code(ctx->fetchh, 302); - - msg.type = FETCH_REDIRECT; - msg.data.redirect = "resource:maps.html"; - - fetch_about_send_callback(&msg, ctx); - - return true; -} - - /** * generate the description of the login query */ @@ -1353,13 +1331,6 @@ struct about_handlers about_handler_list[] = { fetch_about_welcome_handler, false }, - { - "maps", - SLEN("maps"), - NULL, - fetch_about_maps_handler, - false - }, { "config", SLEN("config"), diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 286f99e12..c17ffd979 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -56,7 +56,6 @@ static const char *fetch_resource_paths[] = { "credits.html", "licence.html", "welcome.html", - "maps.html", "favicon.ico", "default.ico", "netsurf.png", diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 7a3573d9f..de4ca78b3 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -200,7 +200,6 @@ endif $(Q)$(RM) $(ATARI_TARGET_DIR)res/messages $(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages -o $(ATARI_TARGET_DIR)res/messages resources/FatMessages $(Q)cp resources/en/welcome.html $(ATARI_TARGET_DIR)res/welcome.html - $(Q)cp resources/en/maps.html $(ATARI_TARGET_DIR)res/maps.html $(Q)cp resources/en/licence.html $(ATARI_TARGET_DIR)res/licence.html $(Q)cp resources/en/credits.html $(ATARI_TARGET_DIR)res/credits.html diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile index 97fa84810..46f12ec85 100644 --- a/frontends/beos/Makefile +++ b/frontends/beos/Makefile @@ -110,7 +110,7 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) RDEP_BEOS := \ adblock.css beosdefault.css default.css internal.css quirks.css \ netsurf.png favicon.png ca-bundle.txt \ - credits.html licence.html welcome.html maps.html SearchEngines + credits.html licence.html welcome.html SearchEngines RDEP_BEOS := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(RDEP_BEOS)) \ $(wildcard $(FRONTEND_RESOURCES_DIR)/icons/*.png) \ diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile index 9bb042f4a..e035afb00 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -217,7 +217,7 @@ EXETARGET := nsfb NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css credits.html \ default.css internal.css licence.html \ - netsurf.png quirks.css welcome.html maps.html + netsurf.png quirks.css welcome.html install-framebuffer: $(VQ)echo " INSTALL: $(DESTDIR)/$(PREFIX)" diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile index ec9889ea0..02a5fdb73 100644 --- a/frontends/gtk/Makefile +++ b/frontends/gtk/Makefile @@ -177,7 +177,7 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_FRONTEND) GTK_RESOURCES_LIST := \ languages SearchEngines ca-bundle.txt \ default.css adblock.css quirks.css internal.css \ - credits.html licence.html welcome.html maps.html Messages \ + credits.html licence.html welcome.html Messages \ default.ico favicon.png netsurf.png netsurf.xpm netsurf-16x16.xpm GTK_RESOURCES_LIST := \ diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index a81500b68..433581786 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -50,7 +50,6 @@ it/welcome.html ja/welcome.html nl/welcome.html - maps.html adblock.css default.css internal.css diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c index 61853e458..a60119ae1 100644 --- a/frontends/gtk/resources.c +++ b/frontends/gtk/resources.c @@ -124,7 +124,6 @@ static struct nsgtk_resource_s direct_resource[] = { RES_ENTRY("welcome.html"), RES_ENTRY("credits.html"), RES_ENTRY("licence.html"), - RES_ENTRY("maps.html"), RES_ENTRY("default.css"), RES_ENTRY("adblock.css"), RES_ENTRY("internal.css"), diff --git a/resources/en/maps.html b/resources/en/maps.html deleted file mode 100644 index 2427d8a9c..000000000 --- a/resources/en/maps.html +++ /dev/null @@ -1,85 +0,0 @@ - - - -NetSurf: Static Maps - - - - -

NetSurf

- - - -
-

Static Maps

- -

Since NetSurf does not yet have enough JavaScript support -to handle most mapping sites on the web, we provide here a simple interface -to Google's Static Maps API.

- -
-
-
-

Example: Oxford Street, London, UK

- - -
-
-
- - - -
Size
ScaleStandard
-Double
-
-
- - - -
Zoom
Type
-
-
-
- - - -
-

NetSurf is licensed under the GNU Public Licence version 2

-
-
- - - -- cgit v1.2.3