[Xfce4-commits] <midori:master> Move destroying into _midori_browser_remove_tab

[Christian Dywan]

Updating branch refs/heads/master
         to b023b27a92838cb31e7986951271c4ac48bf2bf6 (commit)
       from 8ab022ddf083b6a266ec2d93a226a2d64e87fcbd (commit)

commit b023b27a92838cb31e7986951271c4ac48bf2bf6
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Mar 5 23:31:47 2013 +0100

    Move destroying into _midori_browser_remove_tab
    
    Don't directly destroy in _action_tab_close_other_activate
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1116864

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index bdd24a2..0dec76b 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1474,6 +1474,8 @@ _midori_browser_remove_tab (MidoriBrowser* browser,
 #ifdef HAVE_GRANITE
     granite_widgets_dynamic_notebook_remove_tab (
         GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), midori_view_get_tab (view));
+#else
+    gtk_widget_destroy (widget);
 #endif
     if (midori_browser_tab_connected (browser, view))
         midori_browser_disconnect_tab (browser, view);
@@ -4671,7 +4673,7 @@ _action_tab_close_other_activate (GtkAction*     action,
     for (; tabs; tabs = g_list_next (tabs))
     {
         if (tabs->data != view)
-            gtk_widget_destroy (tabs->data);
+            midori_browser_close_tab (browser, tabs->data);
     }
     g_list_free (tabs);
 }
@@ -7366,7 +7368,6 @@ midori_browser_close_tab (MidoriBrowser* browser,
 
     midori_browser_add_tab_to_trash (browser, MIDORI_VIEW (view));
     g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
-    gtk_widget_destroy (view);
 }
 
 /**