Prevent blank pages from landing in the trash

This actually used to work but meanwhile the
definition of a blank view changed.

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index aa5acd69ce29285cc3d4db99dc0547cbe90145bb..e418ae561066a61ccc19fc3767ed57957cadcaf8 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -714,7 +714,7 @@ midori_browser_tab_destroy_cb (GtkWidget*     widget,
     {
         item = midori_view_get_proxy_item (MIDORI_VIEW (widget));
         uri = katze_item_get_uri (item);
-        if (browser->trash && uri && *uri)
+        if (browser->trash && !midori_view_is_blank (MIDORI_VIEW (widget)))
             katze_array_add_item (browser->trash, item);
         katze_array_remove_item (browser->proxy_array, item);
         g_object_unref (item);

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 08430fd7d9691f18cb5bfa9bf678955fe624c6db..b3303ce95e2c291bebeb28cfc4ca88baf7b9433c 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2168,7 +2168,7 @@ midori_view_is_blank (MidoriView*  view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), TRUE);
 
-    return !(view->uri && *view->uri);
+    return midori_view_get_display_uri (view)[0] == '\0';
 }
 
 /**