Re: Thunar 1.8.4 / Debian 10
Hello,
I took the source to Thunar 1.8.5 and extracted the final, patched function.
I take the liberty to send you the patch file, if it can be useful anyhow.
Please forgive my way of doing things, I'm new to this kind of stuff.
By the way, XFCE is cool.
Many thanks,
Arnaud Vasseur
Hello,
I have been using XFCE since 2014, with Jessie, but upgrading to Buster gave me quite a surprise with Thunar.
This bug is very irritating, do you have any idea if the fix could go live someday on the Debian 10's repos?
Many thanks,
Arnaud Vasseur
(some IT engineer)
--- thunar-tree-view.c.original_from_debian_repo.20200619 2020-06-19 10:07:38.952652000 +0200
+++ thunar-tree-view.c.1.8.5.workingPatch 2020-06-19 11:44:10.532426777 +0200
@@ -2501,11 +2501,10 @@
GtkTreePath *path;
GtkTreeIter iter;
ThunarFile *file;
- ThunarFile *parent;
- GFileInfo *parent_info;
+ GFileInfo *file_info;
GtkTreeIter child_iter;
ThunarFile *file_in_tree;
- gboolean done = TRUE;
+ gboolean done = FALSE;
GList *lp;
GList *path_as_list = NULL;
@@ -2517,12 +2516,12 @@
gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), view->select_path, NULL, FALSE);
gtk_tree_path_free (view->select_path);
view->select_path = NULL;
- return done;
+ return TRUE;
}
/* verify that we still have a current directory */
if (G_UNLIKELY (view->current_directory == NULL))
- return done;
+ return TRUE;
/* get the preferred toplevel path for the current directory */
path = thunar_tree_view_get_preferred_toplevel_path (view, view->current_directory);
@@ -2533,70 +2532,92 @@
gtk_tree_model_get_iter (GTK_TREE_MODEL (view->model), &iter, path);
gtk_tree_path_free (path);
+ path = NULL;
/* collect all ThunarFiles in the path of current_directory in a List. root is on the very left side */
for (file = view->current_directory; file != NULL; file = thunar_file_get_parent (file, NULL))
path_as_list = g_list_prepend (path_as_list, file);
- /* note that iter may start at e.g. $HOME where "path_as_list" usually starts at "/" */
- /* So the first few iterations most times will do nothing */
+ /* 1. skip files on path_as_list till we found the beginning of the tree (which e.g. may start at $HOME */
+ gtk_tree_model_get (GTK_TREE_MODEL (view->model), &iter, THUNAR_TREE_MODEL_COLUMN_FILE, &file_in_tree, -1);
for (lp = path_as_list; lp != NULL; lp = lp->next)
{
+ if (THUNAR_FILE (lp->data) == file_in_tree)
+ break;
+ }
+ if (file_in_tree)
+ g_object_unref (file_in_tree);
+
+ /* 2. loop on the remaining path_as_list */
+ for (; lp != NULL; lp = lp->next)
+ {
file = THUNAR_FILE (lp->data);
- /* check if iter has only a dummy node (tree not fully loaded yet) */
+ /* 3 check if iter has only a dummy node (tree not fully loaded yet) */
if( thunar_tree_model_node_has_dummy (view->model, iter.user_data) )
+ break;
+
+ /* 4. Loop on all items of current tree-level to see if any folder matches the path we search */
+ while (TRUE)
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL (view->model), &iter, THUNAR_TREE_MODEL_COLUMN_FILE, &file_in_tree, -1);
+ if (file == file_in_tree)
+ {
+ if (path != NULL)
+ gtk_tree_path_free (path);
+ g_object_unref (file_in_tree);
+ /* always remember latest known path, so we can set the cursor to it */
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->model), &iter);
+ break;
+ }
+ if (file_in_tree)
+ g_object_unref (file_in_tree);
+
+ if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (view->model), &iter))
+ break;
+ }
+
+ /* 5. Did we already find the full path ?*/
+ if (lp->next == NULL)
{
- done = FALSE;
+ done = TRUE;
break;
}
- /* Try to create missing children if there are none (this as well initializes child_iter if there are children) */
+ /* 6. Get all children of the current tree iter */
+ /* Try to create missing children on the tree if there are none */
if (!gtk_tree_model_iter_children (GTK_TREE_MODEL (view->model), &child_iter, &iter))
{
- done = FALSE;
- parent = thunar_file_get_parent (file, NULL);
- if (parent == NULL) /* e.g root has no parent .. skip it */
+ if (file == NULL) /* e.g root has no parent .. skip it */
continue;
- parent_info = thunar_file_get_info (parent);
- if (parent_info != NULL)
+ file_info = thunar_file_get_info (file);
+ if (file_info != NULL)
{
/* E.g. folders for which we do not have read permission dont have any child in the tree */
/* Make sure that missing read permissions are the problem */
- if (!g_file_info_get_attribute_boolean (parent_info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
+ if (!g_file_info_get_attribute_boolean (file_info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
{
/* We KNOW that there is a File. Lets just create the required tree-node */
- thunar_tree_model_add_child (view->model, iter.user_data, file);
+ thunar_tree_model_add_child (view->model, iter.user_data, THUNAR_FILE (lp->next->data));
}
}
- g_object_unref (parent);
break; /* we dont have a valid child_iter by now, so we cannot continue. */
/* Since done is FALSE, the next iteration on thunar_tree_view_cursor_idle will go deeper */
}
+ iter = child_iter; /* next tree level */
+ }
- /* loop on children to see if any folder matches */
- while (TRUE)
- {
- gtk_tree_model_get (GTK_TREE_MODEL (view->model), &child_iter, THUNAR_TREE_MODEL_COLUMN_FILE, &file_in_tree, -1);
- if (file == file_in_tree)
- {
- g_object_unref (file_in_tree);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->model), &child_iter);
- gtk_tree_view_expand_to_path (GTK_TREE_VIEW (view), path);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE);
- gtk_tree_path_free (path);
- iter = child_iter; /* next tree level */
- break;
- }
- if (file_in_tree)
- g_object_unref (file_in_tree);
+ if (path == NULL)
+ path = thunar_tree_view_get_preferred_toplevel_path (view, view->current_directory);
- if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (view->model), &child_iter))
- break;
- }
+ if (path != NULL)
+ {
+ gtk_tree_view_expand_to_path (GTK_TREE_VIEW (view), path);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE);
+ gtk_tree_path_free (path);
}
-
+
/* tidy up */
for (lp = path_as_list; lp != NULL; lp = lp->next)
{
Reply to: