Bug 536641 – Filesystem querying in gio does not list AFS and autofs

        file systems

        * glocalfile.c (get_fs_type): Add afs and autofs.
        Patch by Danny Baumann.

svn path=/trunk/; revision=6988

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 04b04f8..5d63e07 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,13 @@
 2008-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       Bug 536641 – Filesystem querying in gio does not list AFS and autofs
+       file systems
+
+       * glocalfile.c (get_fs_type): Add afs and autofs.
+       Patch by Danny Baumann.
+
+2008-06-10  Matthias Clasen <mclasen@redhat.com>
+
        Bug 528600 – g_dummy_file_get_parent("scheme://example.com/")
 
        * gdummyfile.c (g_dummy_file_get_parent): Return NULL if there

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index aa009e7..166a964 100644 (file)
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -578,7 +578,7 @@ g_local_file_enumerate_children (GFile                *file,
                                 GError              **error)
 {
   GLocalFile *local = G_LOCAL_FILE (file);
-  return _g_local_file_enumerator_new (local->filename,
+  return _g_local_file_enumerator_new (local,
                                       attributes, flags,
                                       cancellable, error);
 }
@@ -618,6 +618,10 @@ get_fs_type (long f_type)
     {
     case 0xadf5:
       return "adfs";
+    case 0x5346414f:
+      return "afs";
+    case 0x0187:
+      return "autofs";
     case 0xADFF:
       return "affs";
     case 0x42465331: