[nautilus/gnome-3-20] files-view: order toolbar view menu actions sync



commit 9bf9626b834a97fc7af6ba451574054a7d880db0
Author: Carlos Soriano <csoriano gnome org>
Date:   Mon Mar 14 22:07:41 2016 +0100

    files-view: order toolbar view menu actions sync
    
    Make sure the menu will get updated when the actions are in the correct
    state.
    
    This will avoid some corner cases when we reset the view before the
    actions are in the correct state, making the view menu insensitive
    or not present.

 src/nautilus-files-view.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 7a85a07..76326f2 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -3170,10 +3170,10 @@ done_loading (NautilusFilesView *view,
         nautilus_profile_start (NULL);
 
         if (!view->details->in_destruction) {
-                nautilus_files_view_update_toolbar_menus (view);
                 remove_loading_floating_bar (view);
                 schedule_update_context_menus (view);
                 schedule_update_status (view);
+                nautilus_files_view_update_toolbar_menus (view);
                 reset_update_interval (view);
 
                 pending_selection = view->details->pending_selection;
@@ -6890,8 +6890,8 @@ nautilus_files_view_update_toolbar_menus (NautilusFilesView *view)
         window = nautilus_files_view_get_window (view);
         nautilus_window_reset_menus (window);
 
-        nautilus_files_view_reset_view_menu (view);
         nautilus_files_view_update_actions_state (view);
+        nautilus_files_view_reset_view_menu (view);
 }
 
 /**


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