[Xfce4-commits] [xfce/thunar] 01/02: Fix thunar history being deleted after view change (bug #12708)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

hjudt pushed a commit to branch master
in repository xfce/thunar.

commit 9578e0dec5cee473222cb813b43de31067c604e2
Author: Adam Purkrt <adam at purkrt.net>
Date:   Tue Oct 11 22:35:23 2016 +0200

    Fix thunar history being deleted after view change (bug #12708)
    
    This commit deletes the extra history copying in
    thunar_window_action_view_changed() function, which apparently
    causes the problem. The history already gets copied in
    thunar_window_notebook_insert().
    
    This effectively reverts commit ad8dd9c351ded0fd0d2c15fba40ec0fc9c6e4598,
    except the #include needed by its follow-up commits.
---
 thunar/thunar-window.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 42be0a8..ccb398f 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -2759,7 +2759,6 @@ thunar_window_action_view_changed (GtkRadioAction *action,
 {
   ThunarFile     *file = NULL;
   ThunarFile     *current_directory = NULL;
-  ThunarHistory  *history = NULL;
   GtkWidget      *old_view;
   GList          *selected_files = NULL;
 
@@ -2779,9 +2778,6 @@ thunar_window_action_view_changed (GtkRadioAction *action,
       /* remember the file selection */
       selected_files = thunar_g_file_list_copy (thunar_component_get_selected_files (THUNAR_COMPONENT (old_view)));
 
-      /* get a copy of the history */
-      history = thunar_standard_view_copy_history (THUNAR_STANDARD_VIEW (old_view));
-
       /* update the UI (else GtkUIManager will crash on merging) */
       gtk_ui_manager_ensure_update (window->ui_manager);
     }
@@ -2822,10 +2818,6 @@ thunar_window_action_view_changed (GtkRadioAction *action,
   if (gtk_widget_get_visible (GTK_WIDGET (window)))
     g_object_set (G_OBJECT (window->preferences), "last-view", g_type_name (window->view_type), NULL);
 
-  /* use the copy of the old history if available */
-  if (history != NULL)
-    thunar_standard_view_set_history (THUNAR_STANDARD_VIEW (window->view), history);
-
   /* release the file references */
   if (G_UNLIKELY (file != NULL))
     g_object_unref (G_OBJECT (file));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.