Merge lp:~midori/midori/tabHistory into lp:midori

[Cris Dywan]

Restore tab history from session via HistoryWebsite

Unmerged revisions

6606. By Cris Dywan on 2014-03-17

Restore tab history from session via HistoryWebsite

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2014-03-16 22:53:49 +0000
+++ extensions/tabby.vala	2014-03-17 00:52:25 +0000
@@ -378,6 +378,7 @@
                 unowned Katze.Item item = view.get_proxy_item ();
                 int64 tab_id = item.get_meta_integer ("tabby-id");
                 string sqlcmd = "UPDATE `tabs` SET uri = :uri WHERE session_id = :session_id AND id = :tab_id;";
+                // TODO: Update tan_history
                 try {
                     database.prepare (sqlcmd,
                                       ":uri", typeof (string), uri,
@@ -501,6 +502,24 @@
                 }
             }
 
+            private void restore_tab_history(Katze.Item item) {
+                var items = new GenericArray<Midori.HistoryWebsite> ();
+                int64 tab_id = item.get_meta_integer ("tabby-id");
+                string sqlcmd = "SELECT url, title FROM tab_history WHERE tab_id = :tab_id ORDER BY tstamp";
+                try {
+                    var statement = database.prepare (sqlcmd,
+                        ":tab_id", typeof (int64), tab_id);
+                    while (statement.step ()) {
+                        string url = statement.get_string ("url");
+                        string title = statement.get_string ("title");
+                        items.add (new Midori.HistoryWebsite (url, title, 0));
+                    }
+                    item.set_data<GenericArray<Midori.HistoryWebsite>> ("tab-history", items);
+                } catch (Error error) {
+                    critical (_("Failed to select from database: %s"), error.message);
+                }
+            }
+
             public override Katze.Array get_tabs() {
                 Katze.Array tabs = new Katze.Array (typeof (Katze.Item));
 
@@ -520,6 +539,7 @@
                         item.set_meta_string ("sorting", sorting.to_string ());
                         // See midori_browser_step_history: don't add to history
                         item.set_meta_string ("history-step", "ignore");
+                        restore_tab_history (item);
                         tabs.add_item (item);
                     }
                 } catch (Error error) {

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-03-16 22:37:47 +0000
+++ midori/midori-view.c	2014-03-17 00:52:25 +0000
@@ -3156,6 +3156,20 @@
         _midori_view_set_settings (view, settings);
     if (item)
     {
+#ifndef HAVE_WEBKIT2
+        GPtrArray* items = g_object_get_data (G_OBJECT (item), "tab-history");
+        WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list (WEBKIT_WEB_VIEW (view->web_view));
+        int i = 0;
+        while (items && i < items->len)
+        {
+            const gchar* uri = midori_history_website_get_uri (items->pdata[i]);
+            const gchar* title = midori_history_item_get_title (items->pdata[i]);
+            WebKitWebHistoryItem* hitem = webkit_web_history_item_new_with_data (uri, title);
+            webkit_web_back_forward_list_add_item (list, hitem);
+            g_object_unref (hitem);
+            i++;
+        }
+#endif
         katze_object_assign (view->item, katze_item_copy (item));
         midori_tab_set_minimized (MIDORI_TAB (view),
             katze_item_get_meta_string (view->item, "minimized") != NULL);