Commit c44d1c8a authored by Jannis Pohlmann's avatar Jannis Pohlmann

Only watch the trash in the tree view side pane.

This is what we had before and it avoids a lot of critical warnings due
to unwatching files (e.g. volume mounts) that are not being watched at
all.
parent cc5395b9
...@@ -337,8 +337,9 @@ thunar_tree_model_init (ThunarTreeModel *model) ...@@ -337,8 +337,9 @@ thunar_tree_model_init (ThunarTreeModel *model)
file = thunar_file_get (lp->data, NULL); file = thunar_file_get (lp->data, NULL);
if (G_LIKELY (file != NULL)) if (G_LIKELY (file != NULL))
{ {
/* watch the file for changes */ /* watch the trash for changes */
thunar_file_watch (file); if (thunar_file_is_trashed (file) && thunar_file_is_root (file))
thunar_file_watch (file);
/* create and append the new node */ /* create and append the new node */
item = thunar_tree_model_item_new_with_file (model, file); item = thunar_tree_model_item_new_with_file (model, file);
...@@ -1270,8 +1271,9 @@ thunar_tree_model_item_reset (ThunarTreeModelItem *item) ...@@ -1270,8 +1271,9 @@ thunar_tree_model_item_reset (ThunarTreeModelItem *item)
/* disconnect from the file */ /* disconnect from the file */
if (G_LIKELY (item->file != NULL)) if (G_LIKELY (item->file != NULL))
{ {
/* unwatch the file */ /* unwatch the trash */
thunar_file_unwatch (item->file); if (thunar_file_is_trashed (item->file) && thunar_file_is_root (item->file))
thunar_file_unwatch (item->file);
/* release and reset the file */ /* release and reset the file */
g_object_unref (G_OBJECT (item->file)); g_object_unref (G_OBJECT (item->file));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment