summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-07-01 02:43:12 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-07-01 02:43:12 +0000
commit67012beaa4c105f24c5c0f5a47445d0a09f6cf1c (patch)
treeca42cf4f36f47d82eaf5d28c78bd3a6176491396
parentc800a9a4f2d38c34bb70f8939ec4b3000ea53e22 (diff)
downloadglib-67012beaa4c105f24c5c0f5a47445d0a09f6cf1c.tar.gz
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=/branches/glib-2-16/; revision=7120
-rw-r--r--gio/ChangeLog10
-rw-r--r--gio/glocalfile.c4
2 files changed, 14 insertions, 0 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog
index 194d48c4e..78087725b 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -2,6 +2,16 @@
Backported from trunk:
+ 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-30 Matthias Clasen <mclasen@redhat.com>
+
+ Backported from trunk:
+
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 782e90e87..d0b3ea6ad 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -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: