Merge lp:~aauzi/midori/hack-webkit2-load_changed-event into lp:midori

[André Auzi]

Make tabby compile with Webkit2

Quite a dirty fix (my vala skills are still at the bottom of the learning curve) but it seems to work on my Fedora with:

Command line _build/default/midori/midori
Midori 0.5.5~r6420 (de.twotoasts.midori_e7e5c179f38dd5f87e718c968d7c09f0_fea087517c26fadd409bd4b9dc642555__0)
GTK+ 3.8.4 (3.8.4) Glib 2.36.3 (2.36.3)
WebKit2GTK+ 2.0.4 (2.0.4) libSoup 2.42.2
cairo 1.12.14 (1.12.14) libnotify 0.7.5
gcr 3.8.2 granite No
Platform X11; Linux i686
Identification Mozilla/5.0 (X11; Linux) AppleWebKit/537.32 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/537.32 Midori/0.5

[Cris Dywan (kalikiana)]

Question: can we use Midori.View here - as it already abstracts WebKit? Might be for the other André to clarify if there was a reason to use WebKit API.

review: Needs Information

[Kevin Fenzi (kevin-launchpad)]

I'll note that this doesn't hit the cmake build, as it doesn't seem to build this extension?

(I assume the problem is still there of course)

[André Stösel (ivaldi)]

Hm, there is no signal in Midori.View -> we would have to add one.
I think we should leave it for now.

[André Stösel (ivaldi)]

review: Approve

[André Stösel (ivaldi)]

@Stéphane Marguet
please don't change the status if there is still a review opened

[Cris Dywan (kalikiana)]

You can connect to "notify::load-event" or notify["load-event"] on the Midori.View, it's a property.

review: Needs Fixing

[André Auzi (aauzi)]

> You can connect to "notify::load-event" or notify["load-event"] on the
> Midori.View, it's a property.

hmmm, isn't it notify::load-status instead?
It's the only property I could find related to load change in the parent classes of Midori.View, in Midori.Tab actually.

[lp:~aauzi/midori/hack-webkit2-load_changed-event]

6421. By André Auzi on 2013-10-11

use load_status instead of WebKit2 load_changed event

6422. By André Auzi on 2013-10-11

Merge lp:midori

6423. By André Auzi on 2013-10-11

untabify

[André Auzi (aauzi)]

> You can connect to "notify::load-event" or notify["load-event"] on the
> Midori.View, it's a property.

notify["load_status"] seems to work... I'd appreciate if somebody more familiar with the tabby extension could confirm the correct behavior.

And let me know, since we are at it, if we should extend this to the:
 view.web_view.notify["uri"].connect ( () => {
 view.web_view.notify["title"].connect ( () => {

which also are properties of Midori.view if I'm not mistaken.

I'll do the change.

[Cris Dywan (kalikiana)]

Sorry, you're quite right, load-event was a typo.

Yes uri and title from Midori.View can be used, this would help moving closer to native GTK+ based tabs without a web view. Though not strictly required for the build fix.
FYI it builds and runs as-is.

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-10-06 12:28:16 +0000
+++ extensions/tabby.vala	2013-10-11 15:20:19 +0000
@@ -204,23 +204,29 @@
                 return this_sorting;
             }
 
-            private void helper_data_changed (Midori.Browser browser, Midori.View view) {
-                ulong sig_id = 0;
-                sig_id = view.web_view.load_started.connect (() => {
+            private void load_status (GLib.Object _view, ParamSpec pspec) {
+                Midori.View view = (Midori.View)_view;
+
+                if (view.load_status == Midori.LoadStatus.PROVISIONAL) {
                     unowned Katze.Item item = view.get_proxy_item ();
-
+                    
                     int64 delay = item.get_meta_integer ("delay");
                     if (delay == Midori.Delay.UNDELAYED) {
                         view.web_view.notify["uri"].connect ( () => {
-                            this.uri_changed (view, view.web_view.uri);
-                        });
+                                this.uri_changed (view, view.web_view.uri);
+                            });
                         view.web_view.notify["title"].connect ( () => {
-                            this.data_changed (view);
-                        });
+                                this.data_changed (view);
+                            });
 
-                        GLib.SignalHandler.disconnect (view.web_view, sig_id);
                     }
-                });
+
+                    view.notify["load-status"].disconnect (load_status);
+                }
+            }
+
+            private void helper_data_changed (Midori.Browser browser, Midori.View view) {
+               view.notify["load-status"].connect (load_status);
             }
 
             private void helper_reorder_tabs (GLib.PtrArray new_tabs) {