fix free space information for ncpfs

svn path=/trunk/; revision=6902

diff --git a/gio/ChangeLog b/gio/ChangeLog
index a1381d3..491c2b5 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,12 @@
 2008-05-17  Matthias Clasen  <mclasen@redhat.com>
 
+       Bug 532965 – Should not return filesystem::free for certain file systems
+
+       * glocalfile.c (g_local_file_query_filesystem_info) Don't return
+       free space for ncpfs.
+
+2008-05-17  Matthias Clasen  <mclasen@redhat.com>
+
        Bug 530196 – _g_local_file_has_trash_dir() doesn't handle st_dev == 0
 
        * glocalfile.c (_g_local_file_has_trash_dir): Handle the case that

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 782e90e..ed40ea6 100644 (file)
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -968,7 +968,8 @@ g_local_file_query_filesystem_info (GFile         *file,
 
   attribute_matcher = g_file_attribute_matcher_new (attributes);
   
-  if (g_file_attribute_matcher_matches (attribute_matcher,
+  if (!no_size &&
+      g_file_attribute_matcher_matches (attribute_matcher,
                                        G_FILE_ATTRIBUTE_FILESYSTEM_FREE))
     {
 #ifdef G_OS_WIN32
@@ -984,7 +985,8 @@ g_local_file_query_filesystem_info (GFile         *file,
       g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE, block_size * statfs_buffer.f_bavail);
 #endif
     }
-  if (g_file_attribute_matcher_matches (attribute_matcher,
+  if (!no_size &&
+      g_file_attribute_matcher_matches (attribute_matcher,
                                        G_FILE_ATTRIBUTE_FILESYSTEM_SIZE))
     {
 #ifdef G_OS_WIN32