[epiphany] Revert "Keep window open when closing the last non overview tab"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Revert "Keep window open when closing the last non overview tab"
- Date: Thu, 3 Jan 2019 18:08:00 +0000 (UTC)
commit 3b33bb6ea12843d05389cb434231934e057b4ae3
Author: Michael Catanzaro <mcatanzaro posteo net>
Date: Thu Jan 3 18:07:50 2019 +0000
Revert "Keep window open when closing the last non overview tab"
This reverts commit fed1608828d009f4e8d27b8da8c1f6503a5c9e32
src/ephy-window.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f9a25b0df..e082b9389 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2664,8 +2664,6 @@ static void
ephy_window_close_tab (EphyWindow *window,
EphyEmbed *tab)
{
- EphyWebView *web_view;
-
/* This function can be called many times for the same embed if the
* web process (or network process) has hung. E.g. the user could
* click the close button several times. This is difficult to guard
@@ -2687,21 +2685,16 @@ ephy_window_close_tab (EphyWindow *window,
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tab), "ephy-window-close-tab-closed")))
return;
- web_view = ephy_embed_get_web_view (tab);
- if (gtk_notebook_get_n_pages (window->notebook) > 1 || ephy_web_view_is_overview (web_view)) {
- g_object_set_data (G_OBJECT (tab), "ephy-window-close-tab-closed", GINT_TO_POINTER (TRUE));
- gtk_widget_destroy (GTK_WIDGET (tab));
+ g_object_set_data (G_OBJECT (tab), "ephy-window-close-tab-closed", GINT_TO_POINTER (TRUE));
+ gtk_widget_destroy (GTK_WIDGET (tab));
- /* If that was the last tab, destroy the window.
- *
- * Beware: window->closing could be true now, after destroying the
- * tab, even if it wasn't at the start of this function.
- */
- if (!window->closing && gtk_notebook_get_n_pages (window->notebook) == 0)
- gtk_widget_destroy (GTK_WIDGET (window));
- } else {
- ephy_web_view_load_url (web_view, "about:overview");
- }
+ /* If that was the last tab, destroy the window.
+ *
+ * Beware: window->closing could be true now, after destroying the
+ * tab, even if it wasn't at the start of this function.
+ */
+ if (!window->closing && gtk_notebook_get_n_pages (window->notebook) == 0)
+ gtk_widget_destroy (GTK_WIDGET (window));
}
typedef struct {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]