From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Tue, 10 Jun 2008 15:37:41 +0000 (+0000)
Subject:         Bug 536641 – Filesystem querying in gio does not list AFS and autofs
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a0c45852e1618b86ef6681b05333bb716febec56;p=dana%2Fcg-glib.git

    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 04b04f84..5d63e075 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+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/")
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index aa009e79..166a964e 100644
--- 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: