summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimo@endlessm.com>2014-01-16 09:17:26 -0800
committerCosimo Cecchi <cosimo@endlessm.com>2014-01-16 09:17:26 -0800
commitb4d26eaa33d3bf1298dcce33ae4626b8f297f529 (patch)
treefac8d72ef3e3d8bf4614e1ee560248a29f339ff3
parent55365d9fc66bec75846fa91bb18b814dc950dba2 (diff)
downloadnautilus-b4d26eaa33d3bf1298dcce33ae4626b8f297f529.tar.gz
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.
-rw-r--r--src/nautilus-window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index dcccdb684..122780002 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);