[Xfce4-commits] <midori:master> Allow last tab to close private and app mode

[Christian Dywan]

Updating branch refs/heads/master
         to fd643d72e9d872aa17a3f5b988f32279ecffe4f1 (commit)
       from 2f40eee0a504be86a1d2dd106f23db5c8f957426 (commit)

commit fd643d72e9d872aa17a3f5b988f32279ecffe4f1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Oct 11 02:53:14 2011 +0200

    Allow last tab to close private and app mode

 midori/midori-browser.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 695398a..0643d78 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2452,11 +2452,15 @@ _action_tab_close_activate (GtkAction*     action,
                             MidoriBrowser* browser)
 {
     GtkWidget* widget = midori_browser_get_current_tab (browser);
-    if (gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) == NULL &&
-        midori_view_is_blank (MIDORI_VIEW (widget)))
+    gboolean last_tab =
+        gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser->notebook), 1) == NULL;
+    if (last_tab && sokoke_is_app_or_private ())
     {
+        gtk_widget_destroy (GTK_WIDGET (browser));
         return;
     }
+    if (last_tab && midori_view_is_blank (MIDORI_VIEW (widget)))
+        return;
     gtk_widget_destroy (widget);
 }