[Xfce4-commits] <midori:master> Dont store about:* pages in history, Reset history step counter

[Christian Dywan]

Updating branch refs/heads/master
         to e2ac49a76ddb519d46c4545c6ec38c5563a2612f (commit)
       from fd48f850a3d973e590cd9fbecab27146643faa28 (commit)

commit e2ac49a76ddb519d46c4545c6ec38c5563a2612f
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Fri Jul 23 17:11:38 2010 -0400

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

 midori/midori-browser.c |   10 ++++++----
 midori/midori-view.c    |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 5caa48a..0ee09e0 100644
--- 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 1b3114d..40083a8 100644
--- 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);