Merge lp:~ivaldi/midori/tabby-about-sessions into lp:midori

[André Stösel]

add about:sessions

Correlates with lp:~ivaldi/midori/outsource-about-pages

[lp:~ivaldi/midori/tabby-about-sessions]

6435. By André Stösel on 2013-10-08

fix vapi

[Cris Dywan (kalikiana)]

Did you consider making contents and mime_type properties rather than functions? That way they could be set and kept around, and used without subclassing.
Will resource-request replace about-content?
Will res:// and stock:// be implemented with resource-request? Then they wouldn't need their own #if for wk2 anymore.

And if I may suggest, this branch looks more like "refactor about: pages with new API" than about:sessions.

review: Needs Information

[André Stösel (ivaldi)]

Hm... this branch isn't finished yet (@"refactor about: pages" (status "Work in progress "))
I tried to remove "about-content", but it dosn't work without removing the "about:" pages code first.
(And I'm not sure if it's still needed afterwards.) -> lp:~ivaldi/midori/outsource-about-pages (work in progress)

(I guess I could change it to properties, but it has to work first ;)

Unmerged revisions

6435. By André Stösel on 2013-10-08

fix vapi

6434. By André Stösel on 2013-10-08

emit RESOURCE_REQUEST

6433. By André Stösel on 2013-10-08

add Midori.Resource base class

6432. By André Stösel on 2013-10-08

add resource_request signal to vapi

6431. By André Stösel on 2013-10-08

new signal view:resource-request

6430. By André Stösel on 2013-10-08

new marshal object:string

6429. By André Stösel on 2013-10-08

new accumulator for objects

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

=== added file 'midori/midori-resource.vala'
--- midori/midori-resource.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-resource.vala	2013-10-08 19:49:14 +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-09-17 15:41:00 +0000
+++ midori/midori-view.c	2013-10-08 19:49:14 +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;
@@ -873,11 +896,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))
         {
@@ -3890,7 +3937,11 @@
             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);
             return;
+        }
         
         if (!strcmp (uri, "about:new"))
             uri = midori_settings_get_tabhome (MIDORI_SETTINGS (view->settings));

=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-09-17 12:59:39 +0000
+++ midori/midori.vapi	2013-10-08 19:49:14 +0000
@@ -207,6 +207,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);
 
     }
 

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2013-08-07 21:23:54 +0000
+++ midori/sokoke.c	2013-10-08 19:49:14 +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-08 19:49:14 +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__ */