Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.956
diff -u -p -u -r1.956 ChangeLog
--- ChangeLog	2001/03/08 07:05:20	1.956
+++ ChangeLog	2001/03/14 18:51:09
@@ -1,3 +1,18 @@
+2001-03-14  John Sullivan  <sullivan@eazel.com>
+
+	reviewed by: <delete if not using a buddy>
+
+	Fixed bug 3337 (Sticky bit doesn't display correctly)
+
+	* libgnomevfs/gnome-vfs-types.h:
+	#define S_ISVTX if it's not already defined.
+	
+	* libgnomevfs/gnome-vfs-module-shared.c:
+	(gnome_vfs_stat_to_file_info): Use S_ISVTX always
+	now that it's always defined. This code was punting
+	on getting this bit, though other gnome-vfs code was
+	happy to set it.
+
 2001-03-07  Maciej Stachowiak  <mjs@eazel.com>
 
 	reviewed by: Robin Slomkowski  <rslomkow@eazel.com>
Index: libgnomevfs/gnome-vfs-module-shared.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-module-shared.c,v
retrieving revision 1.17
diff -u -p -u -r1.17 gnome-vfs-module-shared.c
--- libgnomevfs/gnome-vfs-module-shared.c	2001/03/06 23:33:15	1.17
+++ libgnomevfs/gnome-vfs-module-shared.c	2001/03/14 18:51:10
@@ -98,15 +98,7 @@ gnome_vfs_stat_to_file_info (GnomeVFSFil
 		= statptr->st_mode & (S_IRUSR | S_IWUSR | S_IXUSR
 				      | S_IRGRP | S_IWGRP | S_IXGRP
 				      | S_IROTH | S_IWOTH | S_IXOTH
-				      | S_ISUID | S_ISGID);
-
-#ifdef S_ISVTX
-	GNOME_VFS_FILE_INFO_SET_STICKY (file_info,
-					(statptr->st_mode & S_ISVTX) ? TRUE
-					                             : FALSE);
-#else
-	GNOME_VFS_FILE_INFO_SET_STICKY (file_info, FALSE);
-#endif
+				      | S_ISUID | S_ISGID | S_ISVTX);
 
 	file_info->device = statptr->st_dev;
 	file_info->inode = statptr->st_ino;
Index: libgnomevfs/gnome-vfs-types.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-types.h,v
retrieving revision 1.55
diff -u -p -u -r1.55 gnome-vfs-types.h
--- libgnomevfs/gnome-vfs-types.h	2001/03/06 23:33:15	1.55
+++ libgnomevfs/gnome-vfs-types.h	2001/03/14 18:51:12
@@ -115,10 +115,16 @@ typedef enum {
 
 /* File permissions.  These are the same as the Unix ones, but we wrap them
    into a nicer VFS-like enum.  */
+
+/* S_ISVTX not defined on all systems */
+#ifndef S_ISVTX
+#define S_ISVTX	01000
+#endif
+   
 typedef enum {
 	GNOME_VFS_PERM_SUID = S_ISUID,
 	GNOME_VFS_PERM_SGID = S_ISGID,	
-	GNOME_VFS_PERM_STICKY = 01000,	/* S_ISVTX not defined on all systems */
+	GNOME_VFS_PERM_STICKY = S_ISVTX,
 	GNOME_VFS_PERM_USER_READ = S_IRUSR,
 	GNOME_VFS_PERM_USER_WRITE = S_IWUSR,
 	GNOME_VFS_PERM_USER_EXEC = S_IXUSR,
