Merge lp:~ivaldi/midori/tabby-delayed-change-events into lp:midori

[André Stösel]

don't change uri/title if the tab isn't loaded

[Cris Dywan (kalikiana)]

Nice to get that fixed! I switched to only some of the tabs in a session with restarts after that to verfiy and the titles appear where they should.

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2013-09-26 11:00:38 +0000
+++ extensions/tabby.vala	2013-09-26 16:26:40 +0000
@@ -75,12 +75,12 @@
 
             public void attach (Midori.Browser browser) {
                 browser.add_tab.connect (this.tab_added);
-                browser.add_tab.connect (this.helper_uri_changed);
+                browser.add_tab.connect (this.helper_data_changed);
                 browser.remove_tab.connect (this.tab_removed);
 
                 foreach (Midori.View view in browser.get_tabs ()) {
                     this.tab_added (browser, view);
-                    this.helper_uri_changed (browser, view);
+                    this.helper_data_changed (browser, view);
                 }
             }
 
@@ -94,7 +94,7 @@
                 }
 
                 browser.add_tab.connect (this.tab_added);
-                browser.add_tab.connect (this.helper_uri_changed);
+                browser.add_tab.connect (this.helper_data_changed);
                 browser.remove_tab.connect (this.tab_removed);
 
                 GLib.List<unowned Katze.Item> items = tabs.get_items ();
@@ -125,13 +125,22 @@
                 });
             }
 
-            private void helper_uri_changed (Midori.Browser browser, Midori.View view) {
-                /* FixMe: skip first event while restoring the session */
-                view.web_view.notify["uri"].connect ( () => {
-                    this.uri_changed (view, view.web_view.uri);
-                });
-                view.web_view.notify["title"].connect ( () => {
-                    this.data_changed (view);
+            private void helper_data_changed (Midori.Browser browser, Midori.View view) {
+                ulong sig_id = 0;
+                sig_id = view.web_view.load_started.connect (() => {
+                    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);
+                        });
+                        view.web_view.notify["title"].connect ( () => {
+                            this.data_changed (view);
+                        });
+
+                        GLib.SignalHandler.disconnect (view.web_view, sig_id);
+                    }
                 });
             }
         }