[nautilus] window-slot: only add extra location widgets after switch is complete

[Cosimo Cecchi <cosimoc src gnome org>]

commit 13a9948d984f06c5ffa0dda4ddcc2b7c19c7329e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Apr 16 11:22:36 2014 -0700

    window-slot: only add extra location widgets after switch is complete
    
    This fixes some warnings with location widgets provided by extensions,
    such as gnome-user-share.

 src/nautilus-window-slot.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index b642642..9b58971 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2403,13 +2403,17 @@ location_has_really_changed (NautilusWindowSlot *slot)
         */
        nautilus_window_slot_remove_extra_location_widgets (slot);
        nautilus_window_slot_switch_new_content_view (slot);
-       nautilus_window_slot_setup_extra_location_widgets (slot);
 
        if (slot->details->pending_location != NULL) {
                /* Tell the window we are finished. */
                nautilus_window_slot_update_for_new_location (slot);
        }
 
+       /* Now that we finished switching to the new location,
+        * add back the extra location widgets.
+        */
+       nautilus_window_slot_setup_extra_location_widgets (slot);
+
        location = nautilus_window_slot_get_location (slot);
        if (location != NULL) {
                g_object_ref (location);