From 06aa03c6a6c8bbbe7d74a05b2c661c759df49ca6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 10 Oct 2008 22:50:56 +0200 Subject: [PATCH] Prevent blank pages from landing in the trash This actually used to work but meanwhile the definition of a blank view changed. --- midori/midori-browser.c | 2 +- midori/midori-view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index aa5acd69..e418ae56 100644 --- 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 08430fd7..b3303ce9 100644 --- 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'; } /**