diff options
Diffstat (limited to 'src/nautilus-window.c')
| -rw-r--r-- | src/nautilus-window.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c index d24c0f7dd..a72c6206b 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -646,9 +646,21 @@ static void nautilus_window_destroy (GtkObject *object) { NautilusWindow *window; + NautilusWindowSlot *slot; + GList *l, *slots; window = NAUTILUS_WINDOW (object); + nautilus_window_set_active_slot (window, NULL); + + /* close all slots */ + slots = g_list_copy (window->details->slots); + for (l = slots; l != NULL; l = l->next) { + slot = NAUTILUS_WINDOW_SLOT (l->data); + nautilus_window_close_slot (window, slot); + } + g_list_free (slots); + nautilus_window_manage_views_destroy (window); GTK_OBJECT_CLASS (nautilus_window_parent_class)->destroy (object); @@ -728,20 +740,8 @@ nautilus_window_show_window (NautilusWindow *window) void nautilus_window_close (NautilusWindow *window) { - NautilusWindowSlot *slot; - GList *l, *slots; - g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - nautilus_window_set_active_slot (window, NULL); - - slots = g_list_copy (window->details->slots); - for (l = slots; l != NULL; l = l->next) { - slot = NAUTILUS_WINDOW_SLOT (l->data); - nautilus_window_close_slot (window, slot); - } - g_list_free (slots); - EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window, close, (window)); |