From ce527689c6ec7869d201d51d7b50f9c7738e150b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 27 Jan 2012 23:06:37 +0100 Subject: [PATCH] Split about.css from error.html for about:private --- data/error.html | 58 +------------------------------------------- midori/midori-view.c | 13 +++++++--- wscript | 2 +- 3 files changed, 11 insertions(+), 62 deletions(-) diff --git a/data/error.html b/data/error.html index 82127085..6bc9698e 100644 --- a/data/error.html +++ b/data/error.html @@ -2,67 +2,11 @@ Error page template for Midori. This file is licensed under the terms of the expat license, see the file EXPAT. --> - {title} - +

diff --git a/midori/midori-view.c b/midori/midori-view.c index a1907c82..5233adcf 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1089,7 +1089,7 @@ midori_view_web_view_resource_request_cb (WebKitWebView* web_view, const gchar* uri = webkit_network_request_get_uri (request); /* Only apply custom URIs to special pages for security purposes */ - if (!view->special) + if (!view->special && !midori_view_is_blank (view)) return; if (g_str_has_prefix (uri, "res://")) @@ -3979,10 +3979,15 @@ midori_view_set_uri (MidoriView* view, { katze_assign (view->uri, g_strdup (uri)); data = g_strdup_printf ( - "%s" - "

%s

" + "%s" + "" + "

" + "

%s

" "

" - "

", + "

" + "

", _("Private Browsing"), _("Private Browsing"), _("Midori doesn't store any personal data:"), _("No History or web cookies are being saved."), diff --git a/wscript b/wscript index 0d002021..6d874c3a 100644 --- a/wscript +++ b/wscript @@ -500,7 +500,7 @@ def build (bld): else: Utils.pprint ('BLUE', "logo-shade could not be rasterized.") - for res_file in ['error.html', 'close.png']: + for res_file in ['about.css', 'error.html', 'close.png']: bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file) bld.install_as ( \ '${MDATADIR}/' + APPNAME + '/res/speeddial-head-%s.html' % VERSION, \ -- 2.39.5