[nautilus/gnome-3-8] window: don't set up sidebar before setting active slot



commit b4d26eaa33d3bf1298dcce33ae4626b8f297f529
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Thu Jan 16 09:17:26 2014 -0800

    window: don't set up sidebar before setting active slot
    
    Fixes a crash where we would try to access a window active slot before
    NautilusWindow's constructor set one.

 src/nautilus-window.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index dcccdb6..1227800 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1186,11 +1186,12 @@ nautilus_window_constructed (GObject *self)
        gtk_widget_show (window->details->main_view);
 
        window->details->notebook = create_notebook (window);
-       nautilus_window_set_initial_window_geometry (window);
 
        slot = nautilus_window_open_slot (window, 0);
        nautilus_window_set_active_slot (window, slot);
 
+       nautilus_window_set_initial_window_geometry (window);
+
        window->details->bookmarks_id =
                g_signal_connect_swapped (nautilus_application_get_bookmarks (application), "changed",
                                          G_CALLBACK (nautilus_window_sync_bookmarks), window);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]