Merge lp:~midori/midori/historyStep into lp:midori

[Cris Dywan]

Rework history-step handling and make it work again

[lp:~midori/midori/historyStep]

6605. By Cris Dywan on 2014-03-16

Set history-step ignore when importing from xbel

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2014-01-27 23:15:27 +0000
+++ extensions/tabby.vala	2014-03-16 22:54:14 +0000
@@ -82,6 +82,8 @@
                 double i = 0;
                 foreach (Katze.Item item in items) {
                     item.set_meta_string ("sorting", i.to_string());
+                    // See midori_browser_step_history: don't add to history
+                    item.set_meta_string ("history-step", "ignore");
                     i += 1024;
                     session.add_item (item);
                 }
@@ -516,6 +518,8 @@
                         item.name = title;
                         item.set_meta_integer ("tabby-id", id);
                         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");
                         tabs.add_item (item);
                     }
                 } catch (Error error) {
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-10 22:54:10 +0000
+++ midori/midori-browser.c	2014-03-16 22:54:14 +0000
@@ -429,8 +429,6 @@
         g_object_set (action,
                       "stock-id", GTK_STOCK_REFRESH,
                       "tooltip", _("Reload the current page"), NULL);
-        katze_item_set_meta_integer (midori_view_get_proxy_item (view),
-                                     "dont-write-history", -1);
     }
     else
     {
@@ -662,11 +660,11 @@
                                    GParamSpec*     pspec,
                                    MidoriBrowser*  browser)
 {
+    MidoriView* view = MIDORI_VIEW (widget);
+    MidoriLoadStatus load_status = midori_view_get_load_status (view);
+
     if (widget == midori_browser_get_current_tab (browser))
     {
-        MidoriView* view = MIDORI_VIEW (widget);
-        MidoriLoadStatus load_status = midori_view_get_load_status (view);
-
         if (load_status == MIDORI_LOAD_COMMITTED)
         {
             const gchar* uri = midori_view_get_display_uri (view);
@@ -684,6 +682,10 @@
             midori_browser_activate_action (browser, "Location");
     }
 
+    if (load_status == MIDORI_LOAD_FINISHED)
+        katze_item_set_meta_string (midori_view_get_proxy_item (view),
+                                    "history-step", NULL);
+
     g_object_notify (G_OBJECT (browser), "load-status");
 }
 
@@ -754,8 +756,8 @@
     if (midori_uri_is_blank (proxy_uri))
         return;
 
-    if (katze_item_get_meta_integer (proxy, "history-step") == -1
-     && !katze_item_get_meta_boolean (proxy, "dont-write-history"))
+    const gchar* history_step = katze_item_get_meta_string (proxy, "history-step");
+    if (history_step == NULL)
     {
         GError* error = NULL;
         time_t now = time (NULL);
@@ -771,17 +773,22 @@
             g_error_free (error);
             return;
         }
-        katze_item_set_meta_integer (proxy, "history-step", 1);
+        katze_item_set_meta_string (proxy, "history-step", "update");
         /* FIXME: No signal for adding/ removing */
         katze_array_add_item (browser->history, proxy);
         katze_array_remove_item (browser->history, proxy);
     }
-    else if (katze_item_get_name (proxy)
-     && katze_item_get_meta_integer (proxy, "history-step") >= 1)
-    {
-        midori_browser_update_history_title (browser, proxy);
-        katze_item_set_meta_integer (proxy, "history-step", 2);
-    }
+    else if (!strcmp (history_step, "update"))
+    {
+        if (proxy->name != NULL)
+            midori_browser_update_history_title (browser, proxy);
+    }
+    else if (!strcmp (history_step, "ignore"))
+    {
+        /* This is set when restoring sessions */
+    }
+    else
+        g_warning ("Unexpected history-step: %s", history_step);
 }
 
 static void
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-03-06 23:51:01 +0000
+++ midori/midori-view.c	2014-03-16 22:54:14 +0000
@@ -684,10 +684,7 @@
     }
 
     katze_item_set_added (view->item, time (NULL));
-    katze_item_set_meta_integer (view->item, "history-step", -1);
-
     g_object_set (view, "title", NULL, NULL);
-
     midori_view_unset_icon (view);
 
     if (!strncmp (uri, "https", 5))