? libgnomevfs/.gnome-vfs-module-shared.c.swp
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
retrieving revision 1.2142
diff -u -p -r1.2142 ChangeLog
--- ChangeLog	7 Mar 2005 08:41:31 -0000	1.2142
+++ ChangeLog	13 Mar 2005 22:08:12 -0000
@@ -1,3 +1,20 @@
+2005-03-13  thetroublemaker <thetroublemaker@inventati.org>
+
+	* modules/nfs-method.c:
+	* modules/sftp-method.c:
+	* modules/tar-method.c:
+	changed so that every time uid and gid are initialized the valid_fields
+	corresponding bit fields are set.
+
+2005-03-12  thetroublemaker <thetroublemaker@inventati.org>
+
+	* libgnomevfs/gnome-vfs-file-info.h:
+	changed the GnomeVFSFileInfoFields enum so that it contains both the
+	uid and gid bit fields.
+	* libgnomevfs/gnome-vfs-module-shared.c:
+	changed the gnome_vfs_stat_to_file_info function so that i sets
+	both the uid and gid bit fields.
+
 2005-03-07  Alexander Larsson  <alexl@redhat.com>
 
 	* configure.in:
Index: libgnomevfs/gnome-vfs-file-info.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-file-info.h,v
retrieving revision 1.29
diff -u -p -r1.29 gnome-vfs-file-info.h
--- libgnomevfs/gnome-vfs-file-info.h	11 Aug 2004 07:11:37 -0000	1.29
+++ libgnomevfs/gnome-vfs-file-info.h	13 Mar 2005 22:08:13 -0000
@@ -103,6 +103,8 @@ typedef enum {
  * @GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE: Mime type field is valid
  * @GNOME_VFS_FILE_INFO_FIELDS_ACCESS: Access bits of the permissions
  * bitfield are valid
+ * @GNOME_VFS_FILE_INFO_FIELDS_UID: uid field is valid
+ * @GNOME_VFS_FILE_INFO_FIELDS_GID: gid field is valid
  *
  * Flags indicating what fields in a GnomeVFSFileInfo struct are valid. 
  * Name is always assumed valid (how else would you have gotten a
@@ -125,7 +127,9 @@ typedef enum {
 	GNOME_VFS_FILE_INFO_FIELDS_CTIME = 1 << 11,
 	GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME = 1 << 12,
 	GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE = 1 << 13,
-	GNOME_VFS_FILE_INFO_FIELDS_ACCESS = 1 << 14
+	GNOME_VFS_FILE_INFO_FIELDS_ACCESS = 1 << 14,
+	GNOME_VFS_FILE_INFO_FIELDS_UID = 1 << 15,
+	GNOME_VFS_FILE_INFO_FIELDS_GID = 1 << 16
 } GnomeVFSFileInfoFields;
 
 /* FIXME: It's silly to use the symbolic constants for POSIX here.
Index: libgnomevfs/gnome-vfs-module-shared.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-module-shared.c,v
retrieving revision 1.23
diff -u -p -r1.23 gnome-vfs-module-shared.c
--- libgnomevfs/gnome-vfs-module-shared.c	15 Dec 2003 14:57:07 -0000	1.23
+++ libgnomevfs/gnome-vfs-module-shared.c	13 Mar 2005 22:08:13 -0000
@@ -149,7 +149,8 @@ gnome_vfs_stat_to_file_info (GnomeVFSFil
 	  GNOME_VFS_FILE_INFO_FIELDS_LINK_COUNT | GNOME_VFS_FILE_INFO_FIELDS_SIZE |
 	  GNOME_VFS_FILE_INFO_FIELDS_BLOCK_COUNT | GNOME_VFS_FILE_INFO_FIELDS_IO_BLOCK_SIZE |
 	  GNOME_VFS_FILE_INFO_FIELDS_ATIME | GNOME_VFS_FILE_INFO_FIELDS_MTIME |
-	  GNOME_VFS_FILE_INFO_FIELDS_CTIME;
+	  GNOME_VFS_FILE_INFO_FIELDS_CTIME | GNOME_VFS_FILE_INFO_FIELDS_UID |
+	  GNOME_VFS_FILE_INFO_FIELDS_GID;
 }
 
 
Index: modules/nfs-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/nfs-method.c,v
retrieving revision 1.9
diff -u -p -r1.9 nfs-method.c
--- modules/nfs-method.c	2 Nov 2001 11:15:50 -0000	1.9
+++ modules/nfs-method.c	13 Mar 2005 22:08:14 -0000
@@ -931,7 +931,9 @@ nfs_attr_to_file_info(fattr f, GnomeVFSF
 		GNOME_VFS_FILE_INFO_FIELDS_LINK_COUNT |
 		GNOME_VFS_FILE_INFO_FIELDS_SIZE |
 		GNOME_VFS_FILE_INFO_FIELDS_BLOCK_COUNT |
-		GNOME_VFS_FILE_INFO_FIELDS_IO_BLOCK_SIZE;
+		GNOME_VFS_FILE_INFO_FIELDS_IO_BLOCK_SIZE |
+		GNOME_VFS_FILE_INFO_FIELDS_UID |
+		GNOME_VFS_FILE_INFO_FIELDS_GID;
 
 	return GNOME_VFS_OK;
 }
Index: modules/sftp-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/sftp-method.c,v
retrieving revision 1.31
diff -u -p -r1.31 sftp-method.c
--- modules/sftp-method.c	11 Feb 2005 22:18:08 -0000	1.31
+++ modules/sftp-method.c	13 Mar 2005 22:08:16 -0000
@@ -485,7 +485,9 @@ buffer_read_file_info (Buffer *buf, Gnom
 		info->size = buffer_read_gint64 (buf);
 	}
 	if (flags & SSH2_FILEXFER_ATTR_UIDGID) {
+		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_UID;
 		info->uid = buffer_read_gint32 (buf);
+		info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_GID;
 		info->gid = buffer_read_gint32 (buf);
 	}
 	if (flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
@@ -523,6 +525,7 @@ buffer_read_file_info (Buffer *buf, Gnom
 	/* Set the uid and gid fields naively to the current user to trick Nautilus */
 	info->uid = getuid ();
 	info->gid = getgid ();
+	info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_UID | GNOME_VFS_FILE_INFO_FIELDS_GID;
 
 	DEBUG4 (g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Read file info from %p", buf));
 }
Index: modules/tar-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/tar-method.c,v
retrieving revision 1.2
diff -u -p -r1.2 tar-method.c
--- modules/tar-method.c	20 Jul 2004 21:07:51 -0000	1.2
+++ modules/tar-method.c	13 Mar 2005 22:08:17 -0000
@@ -622,7 +622,9 @@ do_get_file_info (GnomeVFSMethod *method
 			   	  GNOME_VFS_FILE_INFO_FIELDS_ATIME |
 			   	  GNOME_VFS_FILE_INFO_FIELDS_MTIME |
 			   	  GNOME_VFS_FILE_INFO_FIELDS_CTIME |
-			   	  GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE;
+			   	  GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE |
+				  GNOME_VFS_FILE_INFO_FIELDS_UID |
+				  GNOME_VFS_FILE_INFO_FIELDS_GID;
 
 	g_free (name);
 	tar_file_unref (tar);
