From 44225f1b34eb1d393a74cc44dcfc32d102205ef6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 29 Sep 2020 22:48:16 +0100 Subject: split out about scheme handler for nscolours css --- content/fetchers/about/about.c | 63 ++++++------------------------------------ 1 file changed, 8 insertions(+), 55 deletions(-) (limited to 'content/fetchers/about/about.c') diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c index bb9d68273..fe9eba7a4 100644 --- a/content/fetchers/about/about.c +++ b/content/fetchers/about/about.c @@ -26,27 +26,24 @@ * information from the browser from a known, fixed URL. */ -#include -#include -#include +#include +#include #include +#include +#include +#include #include "netsurf/inttypes.h" -#include "netsurf/plot_style.h" -#include "utils/log.h" +#include "utils/errors.h" +#include "utils/nsurl.h" #include "utils/corestrings.h" -#include "utils/nscolour.h" -#include "utils/nsoption.h" #include "utils/utils.h" -#include "utils/messages.h" #include "utils/ring.h" #include "content/fetch.h" #include "content/fetchers.h" -#include "desktop/system_colour.h" - #include "private.h" #include "about.h" #include "blank.h" @@ -54,6 +51,7 @@ #include "config.h" #include "choices.h" #include "imagecache.h" +#include "nscolours.h" #include "query.h" #include "query_auth.h" #include "query_fetcherror.h" @@ -298,51 +296,6 @@ static bool fetch_about_licence_handler(struct fetch_about_context *ctx) } -/** - * Handler to generate the nscolours stylesheet - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_nscolours_handler(struct fetch_about_context *ctx) -{ - nserror res; - const char *stylesheet; - - /* content is going to return ok */ - fetch_set_http_code(ctx->fetchh, 200); - - /* content type */ - if (fetch_about_send_header(ctx, "Content-Type: text/css; charset=utf-8")) { - goto aborted; - } - - res = nscolour_get_stylesheet(&stylesheet); - if (res != NSERROR_OK) { - goto aborted; - } - - res = fetch_about_ssenddataf(ctx, - "html {\n" - "\tbackground-color: #%06x;\n" - "}\n" - "%s", - colour_rb_swap(nscolours[NSCOLOUR_WIN_ODD_BG]), - stylesheet); - if (res != NSERROR_OK) { - goto aborted; - } - - fetch_about_send_finished(ctx); - - return true; - -aborted: - - return false; -} - - /** * Handler to generate about scheme logo page * -- cgit v1.2.3