[Xfce4-commits] <thunar:master> Revert "Instantly emit a change event on the parent folder in the delete job."

Jannis Pohlmann noreply at xfce.org
Fri Nov 19 16:54:02 CET 2010


Updating branch refs/heads/master
         to 9a288cc37f260b5bbe55e8bace3af3ed3d0eebca (commit)
       from fd1d1a0c3a230f9f66c00eb49494dbff929db62c (commit)

commit 9a288cc37f260b5bbe55e8bace3af3ed3d0eebca
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Fri Nov 19 16:52:32 2010 +0100

    Revert "Instantly emit a change event on the parent folder in the delete job."
    
    This reverts commit 68924ba2595fe733b7282d7b35795d4bd767c99c.
    
    The change introduced a crasher when too many files were deleted at
    once. Too many folder reloads are not good. Perhaps we need a
    removed_files closure in addition to the new_files closure.

 thunar/thunar-io-jobs.c |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 6caaa02..a6a43a8 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -25,7 +25,6 @@
 #include <gio/gio.h>
 
 #include <thunar/thunar-enum-types.h>
-#include <thunar/thunar-file-monitor.h>
 #include <thunar/thunar-gio-extensions.h>
 #include <thunar/thunar-io-scan-directory.h>
 #include <thunar/thunar-io-jobs.h>
@@ -367,10 +366,8 @@ _thunar_io_jobs_unlink (ThunarJob   *job,
                         GError     **error)
 {
   ThunarJobResponse response;
-  ThunarFile       *parent_file;
   GFileInfo        *info;
   GError           *err = NULL;
-  GFile            *parent;
   GList            *file_list;
   GList            *lp;
   gchar            *base_name;
@@ -458,25 +455,6 @@ again:
           if (response == THUNAR_JOB_RESPONSE_RETRY)
             goto again;
         }
-      else
-        {
-          /* determine the parent folder of the file if there is any */
-          parent = g_file_get_parent (lp->data);
-          if (parent != NULL)
-            {
-              /* obtain the thunar file for this folder from the cache */
-              parent_file = thunar_file_cache_lookup (parent);
-              if (parent_file != NULL)
-                {
-                  /* Feed a change event so that the delete event is 
-                   * picked up immediately */
-                  thunar_file_monitor_file_changed (parent_file);
-                }
-
-              /* release the parent */
-              g_object_unref (parent);
-            }
-        }
     }
 
   /* release the file list */



More information about the Xfce4-commits mailing list