Midori Web Browser

Merge lp:~midori/midori/nativeGTK+ErrorPages into lp:midori

nativeGTK+ErrorPages
Merge into trunk

Proposed by Cris Dywan on 2015-03-28

Status:	Work in progress
Proposed branch:	lp:~midori/midori/nativeGTK+ErrorPages
Merge into:	lp:midori
Diff against target:	617 lines (+111/-342) 9 files modified AUTHORS (+0/-1) configure (+0/-1) data/error.html (+0/-30) data/logo-shade.svg (+0/-150) extensions/about.vala (+4/-19) midori/midori-oops.vala (+53/-0) midori/midori-tab.vala (+26/-0) midori/midori-view.c (+27/-141) po/POTFILES.in (+1/-0)
To merge this branch:	bzr merge lp:~midori/midori/nativeGTK+ErrorPages
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Midori Devs		2015-03-28	Pending
Review via email: mp+254486@code.launchpad.net

Commit message

Implement Native error pages in GTK+

Revision history for this message

Danielle Foré (danrabbit) wrote on 2015-03-29:

"view-refresh" is the name of the refresh icon ;)

Unmerged revisions

6914. By Cris Dywan on 2015-03-28: Implement Native error pages in GTK+

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Jiaji Yin

Midori Devs

 === modified file 'AUTHORS'
 --- AUTHORS	2009-11-03 16:59:27 +0000
 +++ AUTHORS	2015-03-28 17:27:15 +0000
@@ -23,7 +23,6 @@
      extension: Nancy Runge <nancy@twotoasts.de>
      midori: Nancy Runge <nancy@twotoasts.de>
      news-feed: Nancy Runge <nancy@twotoasts.de>
--    logo-shade: Nancy Runge <nancy@twotoasts.de>
  Translations:
      cs: David Stancl <dstancl@dstancl.cz>
 === modified file 'configure'
 --- configure	2013-11-05 18:00:59 +0000
 +++ configure	2015-03-28 17:27:15 +0000
@@ -73,7 +73,6 @@
      find . -iname CTestTestfile.cmake -exec rm {} \;
      find . -iname *-folders -type d|xargs rm -fr
--    rm -fr data/logo-shade
  fi
  mkdir -p $BUILD_DIR && cd $BUILD_DIR || exit 1
 === removed file 'data/error.html'
 --- data/error.html	2013-10-06 16:41:01 +0000
 +++ data/error.html	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
--<!--
-- Error page template for Midori.
-- This file is licensed under the terms of the expat license, see the file EXPAT.
---->
--<html dir="{dir}">
--<head>
--<title>{title}</title>
--{favicon}
--<link rel="stylesheet" type="text/css" href="res://about.css" />
--</head>
--<body>
--<img id="logo" src="res://logo-shade.png" />
--<div id="main" style="background-image: url({error_icon});">
--            <div id="text">
--                <h1>{title}</h1>
--                <p class="message">{message}<br><i>{description}</i></p>
--                {suggestions}
--            </div>
--            <form method="GET" action="{uri}" id="button">
--                <button type="submit" onclick="location.reload(); return false;" {autofocus}>
--                    <img style="{hide-button-images}" src="stock://gtk-refresh"/>
--                    <span>{tryagain}</span>
--                </button>
--            </form>
--        </div>
--
--<br style="clear: both;"/>
--</div>
--</body>
--</html>
 === removed file 'data/logo-shade.svg'
 --- data/logo-shade.svg	2008-10-16 01:51:39 +0000
 +++ data/logo-shade.svg	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<!-- Created with Inkscape (http://www.inkscape.org/) -->
--<svg
--   xmlns:dc="http://purl.org/dc/elements/1.1/"
--   xmlns:cc="http://creativecommons.org/ns#"
--   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--   xmlns:svg="http://www.w3.org/2000/svg"
--   xmlns="http://www.w3.org/2000/svg"
--   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
--   width="307.65372"
--   height="350"
--   id="svg2418"
--   sodipodi:version="0.32"
--   inkscape:version="0.46"
--   version="1.0"
--   inkscape:export-filename="/home/user/logo-shade.png"
--   inkscape:export-xdpi="90"
--   inkscape:export-ydpi="90"
--   sodipodi:docname="logo-shade.svg"
--   inkscape:output_extension="org.inkscape.output.svg.inkscape">
--  <sodipodi:namedview
--     id="base"
--     pagecolor="#ffffff"
--     bordercolor="#666666"
--     borderopacity="1.0"
--     gridtolerance="10000"
--     guidetolerance="10"
--     objecttolerance="10"
--     inkscape:pageopacity="0.0"
--     inkscape:pageshadow="2"
--     inkscape:zoom="1.03"
--     inkscape:cx="74.949357"
--     inkscape:cy="143.09941"
--     inkscape:document-units="px"
--     inkscape:current-layer="layer1"
--     showgrid="false"
--     inkscape:window-width="1253"
--     inkscape:window-height="682"
--     inkscape:window-x="0"
--     inkscape:window-y="22" />
--  <defs
--     id="defs2420">
--    <linearGradient
--       id="linearGradient3412">
--      <stop
--         id="stop3414"
--         offset="0"
--         style="stop-color:#ffffff;stop-opacity:0.59836066;" />
--      <stop
--         id="stop3416"
--         offset="1"
--         style="stop-color:#97f839;stop-opacity:0;" />
--    </linearGradient>
--    <linearGradient
--       id="linearGradient3458">
--      <stop
--         id="stop3460"
--         offset="0"
--         style="stop-color:#88fe38;stop-opacity:1;" />
--      <stop
--         id="stop3462"
--         offset="1"
--         style="stop-color:#ffffff;stop-opacity:0;" />
--    </linearGradient>
--    <inkscape:perspective
--       id="perspective2426"
--       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
--       inkscape:vp_z="744.09448 : 526.18109 : 1"
--       inkscape:vp_y="0 : 1000 : 0"
--       inkscape:vp_x="0 : 526.18109 : 1"
--       sodipodi:type="inkscape:persp3d" />
--    <linearGradient
--       id="linearGradient3458-648">
--      <stop
--         id="stop2423"
--         offset="0"
--         style="stop-color:#bababa;stop-opacity:1;" />
--      <stop
--         id="stop2425"
--         offset="1"
--         style="stop-color:#ffffff;stop-opacity:0;" />
--    </linearGradient>
--    <linearGradient
--       id="linearGradient3412-967">
--      <stop
--         id="stop2429"
--         offset="0"
--         style="stop-color:#ffffff;stop-opacity:0.59836066;" />
--      <stop
--         id="stop2431"
--         offset="1"
--         style="stop-color:#bababa;stop-opacity:0;" />
--    </linearGradient>
--  </defs>
--  <metadata
--     id="metadata2423">
--    <rdf:RDF>
--      <cc:Work
--         rdf:about="">
--        <dc:format>image/svg+xml</dc:format>
--        <dc:type
--           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
--        <dc:creator>
--          <cc:Agent>
--            <dc:title>Nancy Runge &lt;nancy@twotoasts.de&gt;</dc:title>
--          </cc:Agent>
--        </dc:creator>
--        <cc:license
--           rdf:resource="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" />
--      </cc:Work>
--    </rdf:RDF>
--  </metadata>
--  <g
--     transform="translate(-280.66056,-644.09745)"
--     id="layer1"
--     inkscape:groupmode="layer"
--     inkscape:label="Layer 1">
--    <g
--       id="g2546"
--       style="fill:#ffffff;fill-opacity:1;stroke:#bcbcbc;stroke-opacity:1"
--       transform="matrix(2.7318355,0,0,2.7318355,-731.07518,-1421.3016)">
--      <path
--         sodipodi:nodetypes="ccsscccsc"
--         id="path3598"
--         d="M 479.0149,757.44485 C 463.33929,760.3524 390.05715,768.6009 373.75783,823.05659 C 368.99751,841.48441 371.67629,866.55457 392.88608,865.62945 C 394.38911,865.56465 394.54399,866.0597 395.07871,867.32475 C 403.8111,887.98406 426.11314,884.657 430.13518,876.12801 C 430.41248,875.53998 429.75994,876.1331 430.13518,876.12801 C 452.01909,891.1113 463.94687,870.37434 470.8404,851.89287 C 479.26032,835.85799 484.40756,769.09622 479.90163,773.41411 C 403.13312,846.97906 403.28006,782.18757 479.0149,757.44485"
--         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#bcbcbc;stroke-width:2.79349113000000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
--      <path
--         id="path3606"
--         d="M 394.6271,866.42646 C 389.11843,841.31269 395.51037,833.40754 398.10369,830.14819"
--         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#bcbcbc;stroke-width:2.79349113000000004;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
--         sodipodi:nodetypes="cc" />
--      <path
--         id="path3608"
--         d="M 430.04511,875.57142 C 422.884,860.41673 424.07276,847.90995 429.16085,838.58891"
--         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#bcbcbc;stroke-width:2.79349113000000004;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
--         sodipodi:nodetypes="cc" />
--    </g>
--    <g
--       id="g2551"
--       style="fill:#e8e8e8;fill-opacity:1;stroke:none"
--       transform="matrix(2.7318355,0,0,2.7318355,-731.59243,-1420.9344)">
--      <path
--         sodipodi:nodetypes="cccccccccccc"
--         id="path2553"
--         d="M 447.08573,768.31725 C 436.04919,774.1595 397.92257,781.58705 381.33359,820.27881 C 377.02863,833.88105 375.31278,851.44676 387.44516,857.54862 C 385.16801,848.06163 387.57514,834.11288 393.43272,827.57808 C 397.5473,821.96506 405.70797,826.00823 403.09775,831.29165 C 401.29067,836.46522 394.76631,843.8643 399.87669,863.28435 C 404.09154,874.85534 415.25599,879.58634 422.43347,873.92723 C 414.92666,858.12585 420.32228,825.17457 433.92305,832.69366 C 440.70334,836.82119 424.80942,848.38632 435.43821,869.81488 C 448.73626,880.75776 460.15899,863.55615 464.02222,850.63024 C 472.18961,832.82769 477.16809,790.8233 475.1786,786.29359 C 410.97397,845.50147 395.61545,794.24336 447.07098,768.23969"
--         style="fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79349113;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
--    </g>
--  </g>
--</svg>
 === modified file 'extensions/about.vala'
 --- extensions/about.vala	2014-02-26 20:07:51 +0000
 +++ extensions/about.vala	2015-03-28 17:27:15 +0000
@@ -110,7 +110,6 @@
                  <body>
                      <h1>a<span style="position: absolute; left: -1000px; top: -1000px">lias a=b; echo Copy carefully #</span>bout:version</h1>
                      <p>%s</p>
--                    <img src="res://logo-shade.png" style="position: absolute; right: 15px; bottom: 15px; z-index: -9;">
                      <table>
                          <tr><td>Command line %s</td></tr>
                          %s
@@ -158,23 +157,7 @@
      private class Private : Page {
          public override string uri { get; set; default = "about:private"; }
          public override void get_contents (Midori.View view, string uri) {
--            this.load_html (view, """<html dir="ltr">
--                <head>
--                    <title>%s</title>
--                    <link rel="stylesheet" type="text/css" href="res://about.css">
--                </head>
--                <body>
--                    <img id="logo" src="res://logo-shade.png" />
--                    <div id="main" style="background-image: url(stock://dialog/gtk-dialog-info);">
--                    <div id="text">
--                    <h1>%s</h1>
--                    <p class="message">%s</p><ul class=" suggestions"><li>%s</li><li>%s</li><li>%s</li></ul>
--                    <p class="message">%s</p><ul class=" suggestions"><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>
--                    </div><br style="clear: both"></div>
--                </body>
--            </html>""".printf (
--                _("Private Browsing"), _("Private Browsing"),
--                _("Midori doesn't store any personal data:"),
++            string suggestions = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s".printf (
                  _("No history or web cookies are being saved."),
                  _("Extensions are disabled."),
                  _("HTML5 storage, local database and application caches are disabled."),
@@ -183,7 +166,9 @@
                  _("DNS prefetching is disabled."),
                  _("The language and timezone are not revealed to websites."),
                  _("Flash and other Netscape plugins cannot be listed by websites.")
--            ), uri);
++            );
++            view.widget = new Midori.Oops (uri, "security-high", _("Private Browsing"),
++                _("Midori doesn't store any personal data:"), "", suggestions);
+         }
+     }
 === added file 'midori/midori-oops.vala'
 --- midori/midori-oops.vala	1970-01-01 00:00:00 +0000
 +++ midori/midori-oops.vala	2015-03-28 17:27:15 +0000
@@ -0,0 +1,53 @@
++/*
++ Copyright (C) 2014 Christian Dywan <christian@twotoasts.de>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ See the file COPYING for the full license text.
++*/
++
++namespace Midori {
++    public class Oops : Gtk.Box {
++        public string uri { get; private set; }
++        public string title { get; private set; }
++        public signal void retried ();
++
++        [CCode (type = "GtkWidget*")]
++        public Oops (string uri, string icon, string title, string message, string description, string? suggestions=null, string? retry=null) {
++            this.uri = uri;
++            this.title = title;
++            orientation = Gtk.Orientation.HORIZONTAL;
++            spacing = 4;
++            get_style_context ().add_class ("content-view");
++            var image = new Gtk.Image.from_icon_name (icon, Gtk.IconSize.DIALOG);
++            var header = new Gtk.Label (Markup.printf_escaped (
++                "<big>%s</big>\n%s\n<small>%s</small>\n%s",
++                title, message, description, suggestions ?? ""));
++            header.use_markup = true;
++            header.wrap = true;
++            header.selectable = true;
++            var actions = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
++            actions.layout_style = Gtk.ButtonBoxStyle.START;
++            if (retry != null) {
++                var reload = new Gtk.Button.with_label (retry);
++                reload.image = new Gtk.Image.from_stock (Gtk.Stock.REFRESH, Gtk.IconSize.BUTTON);
++                reload.clicked.connect (()=>{ retried (); });
++                actions.add (reload);
++            }
++
++            var column = new Gtk.Box (Gtk.Orientation.VERTICAL, spacing);
++            var row = new Gtk.Box (Gtk.Orientation.HORIZONTAL, spacing);
++            row.pack_start (image, false, false, spacing);
++            var box = new Gtk.Box (Gtk.Orientation.VERTICAL, spacing);
++            box.pack_start (header, false, false, spacing);
++            box.pack_start (actions, false, false, spacing);
++            row.pack_start (box, false, false, spacing);
++            column.set_center_widget (row);
++            set_center_widget (column);
++            show_all ();
++        }
++    }
++}
 === modified file 'midori/midori-tab.vala'
 --- midori/midori-tab.vala	2014-05-24 23:20:44 +0000
 +++ midori/midori-tab.vala	2015-03-28 17:27:15 +0000
@@ -45,6 +45,23 @@
      public class Tab : Gtk.VBox {
          public Tab related { get; set construct; }
          public WebKit.WebView web_view { get; private set; }
++        /* Since 0.6.0 */
++        Gtk.Widget? native_widget = null;
++        public Gtk.Widget? widget { get {
++            return native_widget;
++        } set {
++            if (value is Midori.Oops) {
++                uri = (value as Midori.Oops).uri;
++                this.set ("title", (value as Midori.Oops).title);
++            }
++            native_widget = value;
++            web_view.hide ();
++            var content = (web_view.parent is Gtk.ScrolledWindow)
++              ? web_view.parent.parent : web_view.parent;
++            (content as Gtk.Box).pack_start (native_widget, true, false);
++            native_widget.show ();
++        }
++        }
          private string current_uri = "about:blank";
          public string uri { get {
@@ -52,6 +69,15 @@
+         }
          protected set {
              current_uri = Midori.URI.format_for_display (value);
++            if (native_widget != null) {
++                native_widget.hide ();
++                var content = (web_view.parent is Gtk.ScrolledWindow)
++                  ? web_view.parent.parent : web_view.parent;
++                content.remove (native_widget);
++                native_widget = null;
++                web_view.show ();
++                notify_property ("widget");
++            }
+         }
+         }
 === modified file 'midori/midori-view.c'
 --- midori/midori-view.c	2015-03-24 23:03:26 +0000
 +++ midori/midori-view.c	2015-03-28 17:27:15 +0000
@@ -625,7 +625,7 @@
                          gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());
                          gchar* title = g_strdup_printf ("Error granting trust: %s", error->message);
                          midori_tab_stop_loading (MIDORI_TAB (view));
--                        midori_view_display_error (view, NULL, NULL, NULL, title, slots, NULL,
++                        midori_view_display_error (view, NULL, "security-low", NULL, title, slots, NULL,
                              _("Trust this website"), NULL);
                          g_free (title);
                          g_free (slots);
@@ -836,79 +836,6 @@
          #endif
          g_free (filepath);
+     }
--    else if (g_str_has_prefix (uri, "stock://"))
--    {
--        GdkPixbuf* pixbuf;
--        const gchar* icon_name = &uri[8] ? &uri[8] : "";
--        gint icon_size = GTK_ICON_SIZE_MENU;
--        static gint icon_size_large_dialog = 0;
--
--        if (!icon_size_large_dialog)
--        {
--            gint width = 48, height = 48;
--            gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &width, &height);
--            icon_size_large_dialog = gtk_icon_size_register ("large-dialog", width * 2, height * 2);
--        }
--
--        if (g_ascii_isalpha (icon_name[0]))
--        {
--            if (g_str_has_prefix (icon_name, "dialog/"))
--            {
--                icon_name = &icon_name [strlen("dialog/")];
--                icon_size = icon_size_large_dialog;
--            }
--            else
--                icon_size = GTK_ICON_SIZE_BUTTON;
--        }
--        else if (g_ascii_isdigit (icon_name[0]))
--        {
--            guint i = 0;
--            while (icon_name[i])
--                if (icon_name[i++] == '/')
--                {
--                    gchar* size = g_strndup (icon_name, i - 1);
--                    icon_size = atoi (size);
--                    /* Compatibility: map pixel to symbolic size */
--                    if (icon_size == 16)
--                        icon_size = GTK_ICON_SIZE_MENU;
--                    g_free (size);
--                    icon_name = &icon_name[i];
--                }
--        }
--
--        /* Render icon as a PNG at the desired size */
--        pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL);
--        if (!pixbuf)
--            pixbuf = gtk_widget_render_icon (GTK_WIDGET (view),
--                GTK_STOCK_MISSING_IMAGE, icon_size, NULL);
--        if (pixbuf)
--        {
--            gboolean success;
--            gchar* buffer;
--            gsize buffer_size;
--            gchar* encoded;
--            gchar* data_uri;
--
--            success = gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", NULL, NULL);
--            g_object_unref (pixbuf);
--            if (!success)
--                return;
--
--            encoded = g_base64_encode ((guchar*)buffer, buffer_size);
--            data_uri = g_strconcat ("data:image/png;base64,", encoded, NULL);
--            g_free (encoded);
--            #ifdef HAVE_WEBKIT2
--            GInputStream* stream = g_memory_input_stream_new_from_data (buffer, buffer_size, g_free);
--            webkit_uri_scheme_request_finish (request, stream, -1, "image/png");
--            g_object_unref (stream);
--            #else
--            g_free (buffer);
--            webkit_network_request_set_uri (request, data_uri);
--            #endif
--            g_free (data_uri);
--            return;
--        }
--    }
+ }
  static void
@@ -1117,6 +1044,13 @@
  #endif
+ }
++static void
++midori_view_error_try_again_clicked_cb (MidoriOops* oops,
++                                        MidoriView* view)
++{
++    midori_view_reload (view, FALSE);
++}
++
  static gboolean
  midori_view_display_error (MidoriView*     view,
                             const gchar*    uri,
@@ -1132,65 +1066,15 @@
                             void*           web_frame)
  #endif
+ {
--    gchar* path = midori_paths_get_res_filename ("error.html");
--    gchar* template;
--
--    if (g_file_get_contents (path, &template, NULL, NULL))
--    {
--        gchar* title_escaped;
--        const gchar* icon;
--        gchar* favicon;
--        gchar* result;
--        gboolean is_main_frame;
--
--        #ifdef HAVE_WEBKIT2
--        is_main_frame = TRUE;
--        #else
--        is_main_frame = web_frame && (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)) == web_frame);
--        #endif
--
--        #if !GTK_CHECK_VERSION (3, 0, 0)
--        /* g_object_get_valist: object class `GtkSettings' has no property named `gtk-button-images' */
--        g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
--        #endif
--
--        GtkSettings* gtk_settings = gtk_widget_get_settings (view->web_view);
--        gboolean show_button_images = gtk_settings != NULL
--          && katze_object_get_boolean (gtk_settings, "gtk-button-images");
--        if (uri == NULL)
--            uri = midori_tab_get_uri (MIDORI_TAB (view));
--        title_escaped = g_markup_escape_text (title ? title : view->title, -1);
--        icon = katze_item_get_icon (view->item);
--        favicon = icon && !g_str_has_prefix (icon, "stock://")
--          ? g_strdup_printf ("<link rel=\"shortcut icon\" href=\"%s\" />", icon) : NULL;
--        result = sokoke_replace_variables (template,
--            "{dir}", gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL ?
--                "rtl" : "ltr",
--            "{title}", title_escaped,
--            "{favicon}", katze_str_non_null (favicon),
--            "{error_icon}", katze_str_non_null (error_icon),
--            "{message}", message,
--            "{description}", description,
--            "{suggestions}", katze_str_non_null (suggestions),
--            "{tryagain}", try_again,
--            "{uri}", uri,
--            "{hide-button-images}", show_button_images ? "" : "display:none",
--            "{autofocus}", is_main_frame ? "autofocus=\"true\" " : "",
--            NULL);
--        g_free (favicon);
--        g_free (title_escaped);
--        g_free (template);
--
--        midori_view_set_html (view, result, uri, web_frame);
--
--        g_free (result);
--        g_free (path);
--
--        return TRUE;
--    }
--    g_free (path);
--
--    return FALSE;
++    if (uri == NULL)
++        uri = midori_tab_get_uri (MIDORI_TAB (view));
++    if (title == NULL)
++        title = view->title ? view->title : uri;
++    const gchar* icon = error_icon ? error_icon : "dialog-error";
++    GtkWidget* error = midori_oops_new (uri, icon, title, message, description, suggestions, try_again);
++    g_signal_connect (error, "retried", G_CALLBACK (midori_view_error_try_again_clicked_cb), view);
++    midori_tab_set_widget (MIDORI_TAB (view), error);
++    return TRUE;
+ }
  static gboolean
@@ -1252,7 +1136,7 @@
                                       midori_uri_parse_hostname(uri, NULL));
+     }
--    result = midori_view_display_error (view, uri, "stock://dialog/network-error", title,
++    result = midori_view_display_error (view, uri, "network-error", title,
                                          message, error->message, NULL,
                                          _("Try Again"), web_frame);
@@ -3672,18 +3556,18 @@
              (GCallback)midori_view_web_view_crashed_cb, view);
      view->scrolled_window = view->web_view;
      WebKitWebContext* context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
--    webkit_web_context_register_uri_scheme (context,
--        "res", midori_view_uri_scheme_res, NULL, NULL);
--    webkit_web_context_register_uri_scheme (context,
--        "stock", midori_view_uri_scheme_res, NULL, NULL);
      g_signal_connect (context, "download-started",
          G_CALLBACK (midori_view_download_started_cb), view);
      #endif
++    GtkWidget* content = gtk_vbox_new (FALSE, 0);
++    gtk_widget_show (content);
++    gtk_box_pack_start (GTK_BOX (content), view->scrolled_window, TRUE, TRUE, 0);
++
      #if GTK_CHECK_VERSION(3, 2, 0)
      view->overlay = gtk_overlay_new ();
      gtk_widget_show (view->overlay);
--    gtk_container_add (GTK_CONTAINER (view->overlay), view->scrolled_window);
++    gtk_container_add (GTK_CONTAINER (view->overlay), content);
      gtk_box_pack_start (GTK_BOX (view), view->overlay, TRUE, TRUE, 0);
      /* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */
@@ -3708,7 +3592,7 @@
                               view->overlay_find);
      gtk_widget_set_no_show_all (view->overlay_find, TRUE);
      #else
--    gtk_box_pack_start (GTK_BOX (view), view->scrolled_window, TRUE, TRUE, 0);
++    gtk_box_pack_start (GTK_BOX (view), content, TRUE, TRUE, 0);
      #endif
      #ifndef HAVE_WEBKIT2
@@ -3884,6 +3768,8 @@
          if (handled)
+         {
++            if (midori_tab_get_widget (MIDORI_TAB (view)) != NULL)
++                return;
              midori_tab_set_uri (MIDORI_TAB (view), uri);
              midori_tab_set_special (MIDORI_TAB (view), TRUE);
              katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
@@ -3896,7 +3782,7 @@
              midori_tab_set_uri (MIDORI_TAB (view), uri);
              midori_tab_set_special (MIDORI_TAB (view), TRUE);
              katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY);
--            midori_view_display_error (view, NULL, "stock://dialog/network-idle", NULL,
++            midori_view_display_error (view, NULL, "network-idle", NULL,
                  _("Page loading delayed:"),
                  _("Loading delayed either due to a recent crash or startup preferences."),
                  NULL,
 === modified file 'po/POTFILES.in'
 --- po/POTFILES.in	2014-04-28 16:32:22 +0000
 +++ po/POTFILES.in	2015-03-28 17:27:15 +0000
@@ -10,6 +10,7 @@
  midori/midori-database.vala
  midori/midori-extension.c
  midori/midori-locationaction.c
++midori/midori-oops.vala
  midori/midori-panel.c
  midori/midori-settings.vala
  midori/midori-websettings.c