glib r6738 - branches/glib-2-16/gio

[sbacher svn gnome org]

Author: sbacher
Date: Wed Mar 19 14:09:57 2008
New Revision: 6738
URL: http://svn.gnome.org/viewvc/glib?rev=6738&view=rev

Log:
2008-03-19  Sebastien Bacher  <seb128 ubuntu com>

	* gunixmounts.c: (guess_mount_type): change from debian,
	consider nfs4 mounts as G_UNIX_MOUNT_TYPE_NFS (#523338)


Modified:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/gunixmounts.c

Modified: branches/glib-2-16/gio/gunixmounts.c
==============================================================================
--- branches/glib-2-16/gio/gunixmounts.c	(original)
+++ branches/glib-2-16/gio/gunixmounts.c	Wed Mar 19 14:09:57 2008
@@ -1568,7 +1568,8 @@
       (strcmp (filesystem_type, "iso9660") == 0) ||
       (strcmp (filesystem_type, "cd9660") == 0))
     type = G_UNIX_MOUNT_TYPE_CDROM;
-  else if (strcmp (filesystem_type, "nfs") == 0)
+  else if ((strcmp (filesystem_type, "nfs") == 0) ||
+           (strcmp (filesystem_type, "nfs4") == 0))
     type = G_UNIX_MOUNT_TYPE_NFS;
   else if (g_str_has_prefix (device_path, "/vol/dev/diskette/") ||
 	   g_str_has_prefix (device_path, "/dev/fd") ||