Dont store about:* pages in history, Reset history step counter

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5caa48a2a8da369c2faf1ca3bf88c3029e916f22..0ee09e06e0a2173de3265cd7d81ff009dca07c34 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -625,16 +625,18 @@ midori_view_notify_title_cb (GtkWidget*     widget,
             proxy = midori_view_get_proxy_item (view);
             proxy_uri = katze_item_get_uri (proxy);
             if (proxy_uri && *proxy_uri && proxy_uri[1] &&
-                (katze_item_get_meta_integer (proxy, "process") == -1))
+                !g_str_has_prefix (proxy_uri, "about:") &&
+                (katze_item_get_meta_integer (proxy, "history-step") == -1))
             {
                 midori_browser_new_history_item (browser, proxy);
-                katze_item_set_meta_integer (proxy, "process", 1);
+                katze_item_set_meta_integer (proxy, "history-step", 1);
             }
             else if (katze_item_get_name (proxy) &&
-                     (katze_item_get_meta_integer (proxy, "process") == 1))
+                     !g_str_has_prefix (proxy_uri, "about:") &&
+                     (katze_item_get_meta_integer (proxy, "history-step") == 1))
             {
                 midori_browser_update_history_title (browser, proxy);
-                katze_item_set_meta_integer (proxy, "process", 2);
+                katze_item_set_meta_integer (proxy, "history-step", 2);
             }
         }
     }

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 1b3114dd388e92ef21186daaddcaf1c576ece625..40083a8f99f9ec4aaf644105c8c986130bd6d2e2 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1011,6 +1011,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*  web_view,
     }
 
     katze_item_set_added (view->item, time (NULL));
+    katze_item_set_meta_integer (view->item, "history-step", -1);
 
     g_object_notify (G_OBJECT (view), "uri");
     g_object_set (view, "title", NULL, NULL);