[Xfce4-commits] r30033 - in thunar/branches/migration-to-gio: . thunar

[Jannis Pohlmann]

Author: jannis
Date: 2009-06-16 17:50:39 +0000 (Tue, 16 Jun 2009)
New Revision: 30033

Modified:
   thunar/branches/migration-to-gio/ChangeLog
   thunar/branches/migration-to-gio/thunar/thunar-file.c
Log:
	* thunar/thunar-file.c: In thunar_file_reload(), always reload the
	  file first, before checking if it still exists and needs to be
	  destroyed.

Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog	2009-06-16 10:15:06 UTC (rev 30032)
+++ thunar/branches/migration-to-gio/ChangeLog	2009-06-16 17:50:39 UTC (rev 30033)
@@ -1,5 +1,11 @@
 2009-06-16	Jannis Pohlmann <jannis at xfce.org>
 
+	* thunar/thunar-file.c: In thunar_file_reload(), always reload the
+	  file first, before checking if it still exists and needs to be
+	  destroyed.
+
+2009-06-16	Jannis Pohlmann <jannis at xfce.org>
+
 	* thunar/thunar-path-entry.c: Display the local path only for native
 	  files. If there is no path, use the URI. Always use the URI for
 	  non-native files.

Modified: thunar/branches/migration-to-gio/thunar/thunar-file.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-file.c	2009-06-16 10:15:06 UTC (rev 30032)
+++ thunar/branches/migration-to-gio/thunar/thunar-file.c	2009-06-16 17:50:39 UTC (rev 30033)
@@ -2786,25 +2786,18 @@
 {
   _thunar_return_if_fail (THUNAR_IS_FILE (file));
 
-  if (!g_file_query_exists (file->gfile, NULL))
+  thunar_file_load (file, NULL, NULL);
+
+  /* destroy the file if we cannot query any file information */
+  if (file->info == NULL)
     {
-      /* the file is no longer present */
       thunar_file_destroy (file);
+      return;
     }
-  else
-    {
-      thunar_file_load (file, NULL, NULL);
 
-      /* destroy the file if we cannot query any file information */
-      if (file->info == NULL)
-        {
-          thunar_file_destroy (file);
-          return;
-        }
-
-      /* ... and tell others */
-      thunar_file_changed (file);
-    }
+  /* ... and tell others */
+  thunar_file_changed (file);
+  
 }