[nautilus] window: small code cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 718b8641935b5a8de67e83ec12f9026aecd41e8c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Sep 28 15:08:18 2011 -0400

    window: small code cleanups

 src/nautilus-window-private.h |    1 -
 src/nautilus-window.c         |   18 +++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index 539aa04..2ac804f 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -127,7 +127,6 @@ typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window,
 
 void               nautilus_window_load_view_as_menus                    (NautilusWindow    *window);
 void               nautilus_window_load_extension_menus                  (NautilusWindow    *window);
-void               nautilus_window_remove_trash_monitor_callback         (NautilusWindow    *window);
 NautilusWindowPane *nautilus_window_get_next_pane                        (NautilusWindow *window);
 void               nautilus_menus_append_bookmark_to_menu                (NautilusWindow    *window, 
                                                                           NautilusBookmark  *bookmark, 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index b2aef34..82aad10 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -735,24 +735,20 @@ nautilus_window_finalize (GObject *object)
 		window->details->sidebar_width_handler_id = 0;
 	}
 
-	g_free (window->details->sidebar_id);
-	g_clear_object (&window->details->nav_state);
-
 	nautilus_window_finalize_menus (window);
-	free_stored_viewers (window);
-
-	if (window->details->bookmark_list != NULL) {
-		g_object_unref (window->details->bookmark_list);
-	}
-
 	g_signal_handlers_disconnect_by_func (nautilus_window_state,
 					      side_pane_id_changed, window);
 
+	g_clear_object (&window->details->nav_state);
+	g_clear_object (&window->details->bookmark_list);
+	g_clear_object (&window->details->ui_manager);
+
+	g_free (window->details->sidebar_id);
+	free_stored_viewers (window);
+
 	/* nautilus_window_close() should have run */
 	g_assert (window->details->panes == NULL);
 
-	g_object_unref (window->details->ui_manager);
-
 	G_OBJECT_CLASS (nautilus_window_parent_class)->finalize (object);
 }