Merge lp:~ivaldi/midori/outsource-about-pages into lp:midori

[André Stösel]

outsource about: pages

Correlates with lp:~ivaldi/midori/tabby-about-sessions

[André Stösel (ivaldi)]

right now about:dial is still in midori-view because of some technical issues

[Cris Dywan (kalikiana)]

I find it quite klunky to have webkit1/2 stuff in the pages and to pass a Midori.View. Is this due to the Redirect page? How about a "uri" property that if no content is given redirects?
And: how about Midori.Resource from the other branch? I have the impression Page really is the same thing except confined to the about-pages extension. Me thinks it should be merged. One step further it could replace about_content and everything becomes simpler.

review: Needs Fixing

[Cris Dywan (kalikiana)]

New branch based on this work, w/o the new API: lp:~midori/midori/outsource-about-pages2

review: Disapprove

Unmerged revisions

6457. By André Stösel on 2013-10-19

remove old about:home, about:new and about:search

6456. By André Stösel on 2013-10-19

always load about-pages extension

6455. By André Stösel on 2013-10-19

add about:search, about:home and about:new

6454. By André Stösel on 2013-10-13

add about:blank

6453. By André Stösel on 2013-10-13

change in signature of Page.get_contents

6452. By André Stösel on 2013-10-13

remove old about:geolocation

6451. By André Stösel on 2013-10-13

add about:geolocation

6450. By André Stösel on 2013-10-13

remove old about:paths

6449. By André Stösel on 2013-10-13

add about:paths

6448. By André Stösel on 2013-10-13

remove old about:private

=== added file 'extensions/about-pages.vala'
--- extensions/about-pages.vala	1970-01-01 00:00:00 +0000
+++ extensions/about-pages.vala	2013-10-19 16:00:26 +0000
@@ -0,0 +1,367 @@
+/*
+   Copyright (C) 2013 André Stösel <[e-mail]>
+
+   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 About {
+    private abstract class Page : GLib.Object {
+        public abstract void get_contents (Midori.View view, string uri);
+        protected void load_html (Midori.View view, string content, string uri) {
+            #if HAVE_WEBKIT2 
+                view.web_view.load_html (content, uri);
+            #else
+                view.web_view.load_html_string (content, uri);
+            #endif
+        }
+    }
+
+    private class Widget : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            string[] widgets = {
+                "<input value=\"demo\"%s>",
+                "<p><input type=\"password\" value=\"demo\"%s></p>",
+                "<p><input type=\"checkbox\" value=\"demo\"%s> demo</p>",
+                "<p><input type=\"radio\" value=\"demo\"%s> demo</p>",
+                "<p><select%s><option>foo bar</option><option selected>spam eggs</option></select></p>",
+                "<p><select%s size=\"3\"><option>foo bar</option><option selected>spam eggs</option></select></p>",
+                "<p><input type=\"file\"%s></p>",
+                "<p><input type=\"file\" multiple%s></p>",
+                "<input type=\"button\" value=\"demo\"%s>",
+                "<p><input type=\"email\" value=\"[e-mail]\"%s></p>",
+                "<input type=\"url\" value=\"http://www.example.com\"%s>",
+                "<input type=\"tel\" value=\"[phone]\" pattern=\"^[0+][1-9 /-]*$\"%s>",
+                "<input type=\"number\" min=1 max=9 step=1 value=\"4\"%s>",
+                "<input type=\"range\" min=1 max=9 step=1 value=\"4\"%s>",
+                "<input type=\"date\" min=1990-01-01 max=2010-01-01%s>",
+                "<input type=\"search\" placeholder=\"demo\"%s>",
+                "<textarea%s>Lorem ipsum doloret sit amet…</textarea>",
+                "<input type=\"color\" value=\"#d1eeb9\"%s>",
+                "<progress min=1 max=9 value=4 %s></progress>",
+                "<keygen type=\"rsa\" challenge=\"235ldahlae983dadfar\"%s>",
+                "<p><input type=\"reset\"%s></p>",
+                "<input type=\"submit\"%s>"
+            };
+
+            string content = """<html>
+                <head>
+                    <style>
+                        .fallback::-webkit-slider-thumb,
+                        .fallback, .fallback::-webkit-file-upload-button {
+                            -webkit-appearance: none !important;
+                        }
+                        .column {
+                            display:inline-block; vertical-align:top;
+                            width:25%;
+                            margin-right:1%;
+                        }
+                    </style>
+                    <title>%s</title>
+                </head>
+                <body>
+                    <h1>%s</h1>
+                    <div class="column">%s</div>
+                    <div class="column">%s</div>
+                    <div class="column">%s</div>
+                    <p><a href="http://example.com" target="wp" onclick="javascript:window.open('http://example.com','wp','width=320, height=240, toolbar=false'); return false;">Popup window</a></p>
+                </body>
+            </html>""";
+
+            string[] widget_options = {"", " disabled", " class=\"fallback\""};
+            string[] widgets_formated = {"", "", ""};
+
+            for (int i = 0; i < widget_options.length && i < widgets_formated.length; i++) {
+                for (int j = 0; j < widgets.length; j++) {
+                    widgets_formated[i] = widgets_formated[i] + widgets[j].printf (widget_options[i]);
+                }
+            }
+
+            this.load_html (view, content.printf (uri, uri, widgets_formated[0], widgets_formated[1], widgets_formated[2]), uri);
+        }
+    }
+
+    private class Version : Page {
+        private string[] valid_about_uris = {
+            "about:dial",
+            "about:geolocation",
+            "about:home",
+            "about:new",
+            "about:paths",
+            "about:private",
+            "about:search",
+            "about:widgets",
+        };
+
+        private string list_about_uris () {
+            string links = "";
+            for (int i = 0; i < valid_about_uris.length; i++) {
+                links = links + "<a href=\"%s\">%s</a> &nbsp;".printf (valid_about_uris[i], valid_about_uris[i]);
+            }
+            return "<p>%s</p>".printf (links);
+        }
+
+        public override void get_contents (Midori.View view, string uri) {
+            string contents = """<html>
+                <head><title>about:version</title></head>
+                <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
+                        <tr><td>Platform %s %s %s</td></tr>
+                        <tr><td>Identification %s</td></tr>
+                        %s
+                    </table>
+                    <table>
+                        %s
+                    </table>
+                    %s
+                </body>
+            </html>""";
+
+            GLib.StringBuilder versions = new GLib.StringBuilder ();
+            Midori.View.list_versions (versions, true);
+
+            string ident; 
+            unowned string architecture;
+            unowned string platform;
+            unowned string sys_name = Midori.WebSettings.get_system_name (out architecture, out platform);
+            view.settings.get ("user-agent", out ident);
+
+            GLib.StringBuilder video_formats = new GLib.StringBuilder ();
+            view.list_video_formats (video_formats, true);
+
+            GLib.StringBuilder ns_plugins = new GLib.StringBuilder ();
+            view.list_plugins (ns_plugins, true);
+
+            /* TODO: list active extensions */
+
+            this.load_html (view, contents.printf (
+                _("Version numbers in brackets show the version used at runtime."),
+                Midori.Paths.get_command_line_str (true),
+                versions.str,
+                platform, sys_name, architecture != null ? architecture : "",
+                ident,
+                video_formats.str,
+                ns_plugins.str,
+                this.list_about_uris ()
+            ), uri);
+        }
+    }
+
+    private class Private : Page {
+        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:"),
+                _("No history or web cookies are being saved."),
+                _("Extensions are disabled."),
+                _("HTML5 storage, local database and application caches are disabled."),
+                _("Midori prevents websites from tracking the user:"),
+                _("Referrer URLs are stripped down to the hostname."),
+                _("DNS prefetching is disabled."),
+                _("The language and timezone are not revealed to websites."),
+                _("Flash and other Netscape plugins cannot be listed by websites.")
+            ), uri);
+        }
+    }
+
+    private class Paths : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            string res_dir = Midori.Paths.get_res_filename ("about.css");
+            string lib_dir = Midori.Paths.get_lib_path (PACKAGE_NAME);
+            this.load_html (view, """<html>
+                <body>
+                    <h1>%s</h1>
+                    <p>config: <code>%s</code></p>
+                    <p>res: <code>%s</code></p>
+                    <p>data: <code>%s/%s</code></p>
+                    <p>lib: <code>%s</code></p>
+                    <p>cache: <code>%s</code></p>
+                    <p>tmp: <code>%s</code></p>
+                </body>
+            </html>""".printf (
+                uri, Midori.Paths.get_config_dir_for_reading (), res_dir,
+                Midori.Paths.get_user_data_dir_for_reading (), PACKAGE_NAME,
+                lib_dir, Midori.Paths.get_cache_dir_for_reading (), Midori.Paths.get_tmp_dir ()
+            ), uri);
+        }
+    }
+
+    private class Geolocation : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            this.load_html (view, """<html>
+                <body>
+                    <a href="http://dev.w3.org/geo/api/spec-source.html" id="method"></a>
+                    <span id="locationInfo"><noscript>No Geolocation without Javascript</noscript></span>
+                    <script>
+                        function displayLocation (position) {
+                            var geouri = 'geo:' + position.coords.latitude + ',' + position.coords.longitude + ',' + position.coords.altitude + ',u=' + position.coords.accuracy;
+                            document.getElementById('locationInfo').innerHTML = '<a href="' + geouri + '">' + geouri + '</a><br><code>'
+                                + ' timestamp: ' + position.timestamp
+                                + ' latitude: ' + position.coords.latitude
+                                + ' longitude: ' + position.coords.longitude
+                                + ' altitude: ' + position.coords.altitude + '<br>'
+                                + ' accuracy: ' + position.coords.accuracy
+                                + ' altitudeAccuracy: ' + position.coords.altitudeAccuracy
+                                + ' heading: ' + position.coords.heading
+                                + ' speed: ' + position.coords.speed
+                                + '</code>';
+                            }
+                            function handleError (error) {
+                                var errorMessage = '<b>' + ['Unknown error', 'Permission denied', 'Position failed', 'Timed out'][error.code] + '</b>';
+                                if (error.code == 3) document.getElementById('locationInfo').innerHTML += (' ' + errorMessage);
+                                else document.getElementById('locationInfo').innerHTML = errorMessage;
+                            }
+                            if (navigator.geolocation) {
+                                var options = { enableHighAccuracy: true, timeout: 60000, maximumAge: "Infinite" };
+                                if (navigator.geolocation.watchPosition) {
+                                    document.getElementById('method').innerHTML = '<code>geolocation.watchPosition</code>:';
+                                    navigator.geolocation.watchPosition(displayLocation, handleError, options);
+                                } else {
+                                    document.getElementById('method').innerHTML = '<code>geolocation.getCurrentPosition</code>:';
+                                    navigator.geolocation.getCurrentPosition(displayLocation, handleError);
+                                }
+                            } else
+                                document.getElementById('locationInfo').innerHTML = 'Geolocation unavailable';
+                    </script>
+                </body>
+            </html>""", uri);
+        }
+    }
+
+    private class Blank : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            /* do nothing (return true in about_content is required) */
+        }
+    }
+
+    private class New : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            view.web_view.load_uri (view.settings.tabhome);
+        }
+    }
+
+    private class Redirects : Page {
+        public override void get_contents (Midori.View view, string uri) {
+            string? new_uri = null;
+            if (uri == "about:new") {
+                new_uri = view.settings.tabhome;
+            }
+
+            if (uri == "about:home") {
+                new_uri = view.settings.homepage;
+            }
+
+            if (uri == "about:search") {
+                new_uri = Midori.URI.for_search (view.settings.location_entry_search, "");
+            }
+
+            if (new_uri != null) {
+                view.set_uri (new_uri);
+            }
+        }
+    }
+
+    private class Manager : Midori.Extension {
+        private GLib.HashTable<string, Page>? about_pages;
+
+        private bool about_content (Midori.View view, string uri) {
+            unowned Page? page = this.about_pages.get (uri);
+            if (page != null) {
+                page.get_contents (view, uri);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void tab_added (Midori.Browser browser, Midori.View view) {
+            view.about_content.connect (this.about_content);
+        }
+
+        private void tab_removed (Midori.Browser browser, Midori.View view) {
+            view.about_content.disconnect (this.about_content);
+        }
+
+        private void browser_added (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_added (browser, tab);
+            }
+            browser.add_tab.connect (this.tab_added);
+            browser.remove_tab.connect (this.tab_removed);
+        }
+
+        private void browser_removed (Midori.Browser browser) {
+            foreach (Midori.View tab in browser.get_tabs ()) {
+                this.tab_removed (browser, tab);
+            }
+            browser.add_tab.disconnect (this.tab_added);
+            browser.remove_tab.disconnect (this.tab_removed);
+        }
+
+        public void activated (Midori.App app) {
+            this.about_pages = new GLib.HashTable<string, Page> (GLib.str_hash, GLib.str_equal);
+            this.about_pages.insert ("about:widgets", new Widget ());
+            this.about_pages.insert ("about:version", new Version ());
+            this.about_pages.insert ("about:private", new Private ());
+            this.about_pages.insert ("about:paths", new Paths ());
+            this.about_pages.insert ("about:geolocation", new Geolocation ());
+            this.about_pages.insert ("about:blank", new Blank ());
+            this.about_pages.insert ("about:new", new Redirects ());
+            this.about_pages.insert ("about:home", new Redirects ());
+            this.about_pages.insert ("about:search", new Redirects ());
+
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_added (browser);
+            }
+            app.add_browser.connect (this.browser_added);
+        }
+
+        public void deactivated () {
+            Midori.App app = this.get_app ();
+            foreach (Midori.Browser browser in app.get_browsers ()) {
+                this.browser_removed (browser);
+            }
+            app.add_browser.disconnect (this.browser_added);
+
+            this.about_pages = null;
+        }
+
+        internal Manager () {
+            GLib.Object (name: _("About pages"),
+                         description: _(".."),
+                         version: "0.1",
+                         authors: "André Stösel <[e-mail]>");
+
+            this.activate.connect (this.activated);
+            this.deactivate.connect (this.deactivated);
+        }
+    }
+}
+
+public Midori.Extension extension_init () {
+    return new About.Manager ();
+}
+

=== modified file 'midori/marshal.list'
--- midori/marshal.list	2013-09-03 14:45:17 +0000
+++ midori/marshal.list	2013-10-19 16:00:26 +0000
@@ -4,6 +4,7 @@
 BOOLEAN:VOID
 BOOLEAN:STRING
 OBJECT:OBJECT
+OBJECT:STRING
 VOID:BOOLEAN,STRING
 VOID:OBJECT,ENUM,BOOLEAN
 VOID:OBJECT,INT,INT

=== modified file 'midori/midori-extension.c'
--- midori/midori-extension.c	2013-09-08 00:50:33 +0000
+++ midori/midori-extension.c	2013-10-19 16:00:26 +0000
@@ -563,6 +563,7 @@
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libapps." G_MODULE_SUFFIX, activate));
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libdelayed-load." G_MODULE_SUFFIX, activate));
         g_assert (midori_extension_activate_gracefully (app, extension_path, "libtabby." G_MODULE_SUFFIX, activate));
+        g_assert (midori_extension_activate_gracefully (app, extension_path, "libabout-pages." G_MODULE_SUFFIX, activate));
     }
     else
     {
@@ -677,7 +678,8 @@
     if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX)
      || !strcmp (filename, "libapps." G_MODULE_SUFFIX)
      || !strcmp (filename, "libdelayed-load." G_MODULE_SUFFIX)
-     || !strcmp (filename, "libtabby." G_MODULE_SUFFIX))
+     || !strcmp (filename, "libtabby." G_MODULE_SUFFIX)
+     || !strcmp (filename, "libabout-pages." G_MODULE_SUFFIX))
         return;
 
     katze_array_add_item (extensions, extension);

=== added file 'midori/midori-resource.vala'
--- midori/midori-resource.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-resource.vala	2013-10-19 16:00:26 +0000
@@ -0,0 +1,17 @@
+/*
+   Copyright (C) 2013 André Stösel <[e-mail]>
+
+   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 abstract class Resource : GLib.Object {
+        public abstract string get_contents ();
+        public abstract string get_mime_type ();
+    }
+}

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-10-16 18:57:04 +0000
+++ midori/midori-view.c	2013-10-19 16:00:26 +0000
@@ -161,6 +161,7 @@
     DOWNLOAD_REQUESTED,
     ADD_BOOKMARK,
     ABOUT_CONTENT,
+    RESOURCE_REQUEST,
 
     LAST_SIGNAL
 };
@@ -326,6 +327,28 @@
         G_TYPE_BOOLEAN, 1,
         G_TYPE_STRING);
 
+    /**
+     * MidoriView::resource-request:
+     * @view: the object on which the signal is emitted
+     * @uri: the resource URI
+     *
+     * Emitted for resource requests on special views
+     *
+     * Return value: Midori.Resource object
+     *
+     * Since: 0.5.6
+     */
+    signals[RESOURCE_REQUEST] = g_signal_new (
+        "resource-request",
+        G_TYPE_FROM_CLASS (class),
+        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+        0,
+        sokoke_signal_accumulator_object_handled,
+        NULL,
+        midori_cclosure_marshal_OBJECT__STRING,
+        G_TYPE_OBJECT, 1,
+        G_TYPE_STRING);
+
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->constructor = midori_view_constructor;
     gobject_class->finalize = midori_view_finalize;
@@ -871,11 +894,35 @@
     if (!midori_tab_get_special (MIDORI_TAB (view)))
         return;
 
-    if (g_str_has_prefix (uri, "res://"))
+    gchar* contents;
+    MidoriResource* resource = NULL;
+    g_signal_emit (view, signals[RESOURCE_REQUEST], 0, uri, &resource);
+
+    if (resource) {
+        gchar* mime_type = midori_resource_get_mime_type (MIDORI_RESOURCE (resource));
+        contents = midori_resource_get_contents (MIDORI_RESOURCE (resource));
+
+        #ifdef HAVE_WEBKIT2
+        GInputStream* stream = g_memory_input_stream_new_from_data (contents, -1, g_free);
+        webkit_uri_scheme_request_finish (request, stream, -1, mime_type);
+        g_object_unref (stream);
+        #else
+        gchar* encoded;
+        gchar* data_uri;
+
+        encoded = g_base64_encode (contents, strlen (contents));
+        data_uri = g_strconcat ("data:", mime_type, ";base64,", encoded, NULL);
+        g_free (encoded);
+        webkit_network_request_set_uri (request, data_uri);
+        g_free (data_uri);
+        g_free (contents);
+        #endif
+        g_free (mime_type);
+    }
+    else if (g_str_has_prefix (uri, "res://"))
     {
         gchar* filepath = midori_paths_get_res_filename (&uri[6]);
         #ifdef HAVE_WEBKIT2
-        gchar* contents;
         gsize length;
         if (g_file_get_contents (filepath, &contents, &length, NULL))
         {
@@ -3773,44 +3820,7 @@
     #endif
 }
 
-static void
-list_geolocation (GString* markup)
-{
-    g_string_append (markup,
-    "<a href=\"http://dev.w3.org/geo/api/spec-source.html\" id=\"method\"></a>"
-    "<span id=\"locationInfo\"><noscript>No Geolocation without Javascript</noscript></span>"
-    "<script>"
-    "function displayLocation (position) {"
-    "var geouri = 'geo:' + position.coords.latitude + ',' + position.coords.longitude + ',' + position.coords.altitude + ',u=' + position.coords.accuracy;"
-    "document.getElementById('locationInfo').innerHTML = '<a href=\"' + geouri + '\">' + geouri + '</a><br><code>'"
-    "+ ' timestamp: ' + position.timestamp"
-    "+ ' latitude: ' + position.coords.latitude"
-    "+ ' longitude: ' + position.coords.longitude"
-    "+ ' altitude: ' + position.coords.altitude + '<br>'"
-    "+ ' accuracy: ' + position.coords.accuracy"
-    "+ ' altitudeAccuracy: ' + position.coords.altitudeAccuracy"
-    "+ ' heading: ' + position.coords.heading"
-    "+ ' speed: ' + position.coords.speed"
-    "+ '</code>'; }"
-    "function handleError (error) {"
-    "var errorMessage = '<b>' + ['Unknown error', 'Permission denied', 'Position failed', 'Timed out'][error.code] + '</b>';"
-    "if (error.code == 3) document.getElementById('locationInfo').innerHTML += (' ' + errorMessage);"
-    "else document.getElementById('locationInfo').innerHTML = errorMessage; }"
-    "if (navigator.geolocation) {"
-    "var options = { enableHighAccuracy: true, timeout: 60000, maximumAge: \"Infinite\" };"
-    "  if (navigator.geolocation.watchPosition) {"
-    "    document.getElementById('method').innerHTML = '<code>geolocation.watchPosition</code>:';"
-    "    navigator.geolocation.watchPosition(displayLocation, handleError, options);"
-    "  } else {"
-    "    document.getElementById('method').innerHTML = '<code>geolocation.getCurrentPosition</code>:';"
-    "    navigator.geolocation.getCurrentPosition(displayLocation, handleError);"
-    "  }"
-    "} else"
-    "  document.getElementById('locationInfo').innerHTML = 'Geolocation unavailable';"
-    "</script>");
-}
-
-static void
+void
 midori_view_list_video_formats (MidoriView* view,
                                 GString*    formats,
                                 gboolean    html)
@@ -3835,28 +3845,6 @@
 #endif
 }
 
-static const gchar* valid_about_uris[] = {
-    "about:dial",
-    "about:geolocation",
-    "about:home",
-    "about:new",
-    "about:paths",
-    "about:private",
-    "about:search",
-    "about:widgets",
-};
-
-static void
-list_about_uris (GString* markup)
-{
-    g_string_append (markup, "<p>");
-    guint i;
-    for (i = 0; i < G_N_ELEMENTS (valid_about_uris); i++)
-        g_string_append_printf (markup, "<a href=\"%s\">%s</a> &nbsp;",
-                                valid_about_uris[i], valid_about_uris[i]);
-}
-
-
 /**
  * midori_view_set_uri:
  * @view: a #MidoriView
@@ -3888,17 +3876,12 @@
             g_signal_emit (view, signals[ABOUT_CONTENT], 0, uri, &handled);
 
         if (handled)
+        {
+            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);
+            katze_item_set_uri (view->item, midori_tab_get_uri (MIDORI_TAB (view)));
             return;
-        
-        if (!strcmp (uri, "about:new"))
-            uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));
-        if (!strcmp (uri, "about:home"))
-            uri = midori_settings_get_homepage (MIDORI_SETTINGS (view->settings));
-        if (!strcmp (uri, "about:search"))
-        {
-            uri = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings));
-            temporary_uri = midori_uri_for_search (uri, "");
-            uri = temporary_uri;
         }
 
         if (!strcmp (uri, "about:dial"))
@@ -3925,170 +3908,6 @@
                 g_timer_destroy (timer);
             }
         }
-        else if (midori_uri_is_blank (uri))
-        {
-            data = NULL;
-            if (!strcmp (uri, "about:widgets"))
-            {
-                static const gchar* widgets[] = {
-                    "<input value=\"demo\"%s>",
-                    "<p><input type=\"password\" value=\"demo\"%s>",
-                    "<p><input type=\"checkbox\" value=\"demo\"%s> demo",
-                    "<p><input type=\"radio\" value=\"demo\"%s> demo",
-                    "<p><select%s><option>foo bar</option><option selected>spam eggs</option></select>",
-                    "<p><select%s size=\"3\"><option>foo bar</option><option selected>spam eggs</option></select>",
-                    "<p><input type=\"file\"%s>",
-                    "<p><input type=\"file\" multiple%s>",
-                    "<input type=\"button\" value=\"demo\"%s>",
-                    "<p><input type=\"email\" value=\"[e-mail]\"%s>",
-                    "<input type=\"url\" value=\"http://www.example.com\"%s>",
-                    "<input type=\"tel\" value=\"[phone]\" pattern=\"^[0+][1-9 /-]*$\"%s>",
-                    "<input type=\"number\" min=1 max=9 step=1 value=\"4\"%s>",
-                    "<input type=\"range\" min=1 max=9 step=1 value=\"4\"%s>",
-                    "<input type=\"date\" min=1990-01-01 max=2010-01-01%s>",
-                    "<input type=\"search\" placeholder=\"demo\"%s>",
-                    "<textarea%s>Lorem ipsum doloret sit amet…</textarea>",
-                    "<input type=\"color\" value=\"#d1eeb9\"%s>",
-                    "<progress min=1 max=9 value=4 %s></progress>",
-                    "<keygen type=\"rsa\" challenge=\"235ldahlae983dadfar\"%s>",
-                    "<p><input type=\"reset\"%s>",
-                    "<input type=\"submit\"%s>",
-                };
-                guint i;
-                GString* demo = g_string_new ("<html><head><style>"
-                    ".fallback::-webkit-slider-thumb,"
-                    ".fallback, .fallback::-webkit-file-upload-button {"
-                    "-webkit-appearance: none !important }"
-                    ".column { display:inline-block; vertical-align:top;"
-                    "width:25%;margin-right:1% }</style><title>");
-                g_string_append_printf (demo,
-                    "%s</title></head><body><h1>%s</h1>", uri, uri);
-                g_string_append (demo, "<div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], "");
-                g_string_append (demo, "</div><div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], " disabled");
-                g_string_append (demo, "</div><div class=\"column\">");
-                for (i = 0; i < G_N_ELEMENTS (widgets); i++)
-                    g_string_append_printf (demo, widgets[i], " class=\"fallback\"");
-                g_string_append (demo, "</div>");
-                g_string_append (demo, "<p><a href=\"http://example.com\" target=\"wp\" "
-                                       "onclick=\"javascript:window.open('http://example.com','wp',"
-                                       "'width=320, height=240, toolbar=false'); return false\""
-                                       ">Popup window</a></p>");
-                data = g_string_free (demo, FALSE);
-            }
-            else if (!strcmp (uri, "about:private"))
-            {
-                data = g_strdup_printf (
-                    "<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>",
-                    _("Private Browsing"), _("Private Browsing"),
-                    _("Midori doesn't store any personal data:"),
-                    _("No history or web cookies are being saved."),
-                    _("Extensions are disabled."),
-                    _("HTML5 storage, local database and application caches are disabled."),
-                    _("Midori prevents websites from tracking the user:"),
-                    _("Referrer URLs are stripped down to the hostname."),
-                    _("DNS prefetching is disabled."),
-                    _("The language and timezone are not revealed to websites."),
-                    _("Flash and other Netscape plugins cannot be listed by websites."));
-            }
-            else if (!strcmp (uri, "about:geolocation"))
-            {
-                GString* markup = g_string_new ("");
-                list_geolocation (markup);
-                data = g_string_free (markup, FALSE);
-            }
-            else if (!strcmp (uri, "about:paths"))
-            {
-                gchar* res_dir = midori_paths_get_res_filename ("about.css");
-                gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME);
-                data = g_markup_printf_escaped ("<body><h1>%s</h1>"
-                    "<p>config: <code>%s</code></p>"
-                    "<p>res: <code>%s</code></p>"
-                    "<p>data: <code>%s/%s</code></p>"
-                    "<p>lib: <code>%s</code></p>"
-                    "<p>cache: <code>%s</code></p>"
-                    "<p>tmp: <code>%s</code></p>"
-                    "</body>",
-                    uri, midori_paths_get_config_dir_for_reading (), res_dir,
-                    midori_paths_get_user_data_dir_for_reading (), PACKAGE_NAME,
-                    lib_dir, midori_paths_get_cache_dir_for_reading (), midori_paths_get_tmp_dir ());
-                g_free (res_dir);
-                g_free (lib_dir);
-            }
-            else if (!strcmp (uri, "about:") || !strcmp (uri, "about:version"))
-            {
-                gchar* command_line = midori_paths_get_command_line_str (TRUE);
-                gchar* architecture, *platform;
-                const gchar* sys_name = midori_web_settings_get_system_name (
-                    &architecture, &platform);
-                gchar* ident = katze_object_get_string (view->settings, "user-agent");
-                GString * tmp = g_string_new ("");
-
-                g_string_append_printf (tmp,
-                    "<html><head><title>about:version</title></head>"
-                    "<body><h1>a%sbout:version</h1>"
-                    "<p>%s</p>"
-                    "<img src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "<table>",
-                    "<span style=\"position: absolute; left: -1000px; top: -1000px\">lias a=b; echo Copy carefully #</span>",
-                    _("Version numbers in brackets show the version used at runtime."));
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Command line %s",
-                    command_line));
-                midori_view_list_versions (tmp, TRUE);
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Platform %s %s %s",
-                    platform, sys_name, architecture ? architecture : ""));
-                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s",
-                    ident));
-                midori_view_list_video_formats (view, tmp, TRUE);
-
-                g_string_append (tmp, "</table><table>");
-                midori_view_list_plugins (view, tmp, TRUE);
-                g_string_append (tmp, "</table>");
-                list_about_uris (tmp);
-                /* TODO: list active extensions */
-
-                g_string_append (tmp, "</body></html>");
-                data = g_string_free (tmp, FALSE);
-
-                g_free (command_line);
-                g_free (ident);
-            }
-            else if (!strcmp (uri, "about:blank"))
-                data = g_strdup ("<body></body>");
-            else
-            {
-                data = g_strdup_printf (
-                    "<html><head><title>%s</title></head><body><h1>%s</h1>"
-                    "<img src=\"res://logo-shade.png\" "
-                    "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
-                    "</body></html>", uri, uri);
-            }
-
-            midori_tab_set_uri (MIDORI_TAB (view), uri);
-            midori_tab_set_special (MIDORI_TAB (view), TRUE);
-#ifndef HAVE_WEBKIT2
-            webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (view->web_view), data, uri);
-#else
-            webkit_web_view_load_html (WEBKIT_WEB_VIEW (view->web_view), data, uri);
-#endif
-            g_free (data);
-            katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
-            katze_item_set_uri (view->item, midori_tab_get_uri (MIDORI_TAB (view)));
-        }
         else if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_DELAYED)
         {
             midori_tab_set_uri (MIDORI_TAB (view), uri);

=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2013-04-08 18:11:54 +0000
+++ midori/midori-view.h	2013-10-19 16:00:26 +0000
@@ -79,6 +79,10 @@
 midori_view_get_load_status            (MidoriView*        view);
 
 void
+midori_view_list_video_formats         (MidoriView*        view,
+                                        GString*           formats,
+                                        gboolean           html);
+void
 midori_view_set_uri                    (MidoriView*        view,
                                         const gchar*       uri);
 

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-10-09 20:05:29 +0000
+++ midori/midori.vapi	2013-10-19 16:00:26 +0000
@@ -194,6 +194,9 @@
         public void reload (bool from_cache);
         public Gtk.Widget add_info_bar (Gtk.MessageType type, string message, GLib.Callback? callback, void* object, ...);
         public ContextAction get_page_context_action (WebKit.HitTestResult hit_test_result);
+        public void list_plugins (GLib.StringBuilder ns_plugins, bool html);
+        public void list_video_formats (GLib.StringBuilder formats, bool html);
+        public static void list_versions (GLib.StringBuilder markup, bool html);
 
         public string title { get; }
         public Gdk.Pixbuf icon { get; }
@@ -207,6 +210,7 @@
         [HasEmitter]
         public signal bool download_requested (WebKit.Download download);
         public signal bool about_content (string uri);
+        public signal GLib.Object? resource_request (string uri);
 
     }
 
@@ -244,6 +248,7 @@
         public MidoriStartup load_on_startup { get; set; }
         public static bool has_plugin_support ();
         public static bool skip_plugin (string path);
+        public static unowned string get_system_name (out unowned string? architecture, out unowned string? platform);
     }
 
     [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")]

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-08-07 21:23:54 +0000
+++ midori/sokoke.c	2013-10-19 16:00:26 +0000
@@ -1119,3 +1119,16 @@
     g_free (launcher_type);
 }
 #endif
+
+gboolean
+sokoke_signal_accumulator_object_handled (GSignalInvocationHint* ihint,
+                                          GValue*                returnAccu,
+                                          const GValue*          handlerReturn,
+                                          gpointer               dummy)
+{
+    gpointer newObject = g_value_get_object(handlerReturn);
+    g_value_set_object(returnAccu, newObject);
+
+    // Continue if we don't have a newObject
+    return !newObject;
+}

=== modified file 'midori/sokoke.h'
--- midori/sokoke.h	2013-08-02 16:40:27 +0000
+++ midori/sokoke.h	2013-10-19 16:00:26 +0000
@@ -133,4 +133,10 @@
 sokoke_create_win32_desktop_lnk (gchar* prefix, gchar* filename, gchar* uri);
 #endif
 
+gboolean
+sokoke_signal_accumulator_object_handled (GSignalInvocationHint* ihint,
+                                          GValue*                returnAccu,
+                                          const GValue*          handlerReturn,
+                                          gpointer               dummy);
+
 #endif /* !__SOKOKE_H__ */