gvfs r2061 - in branches/gnome-2-24: . client daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Oct 20 08:42:27 2008
New Revision: 2061
URL: http://svn.gnome.org/viewvc/gvfs?rev=2061&view=rev

Log:
2008-10-20  Alexander Larsson  <alexl redhat com>

	Import from trunk:
	
	* daemon/gvfsbackendcomputer.c (try_create_dir_monitor):
	Always fail the job when we don't support monitoring.

	* client/gvfsfusedaemon.c (getattr_for_file):
	Correct st_blocks rounding in previous commit




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/client/gvfsfusedaemon.c
   branches/gnome-2-24/daemon/gvfsbackendcomputer.c

Modified: branches/gnome-2-24/client/gvfsfusedaemon.c
==============================================================================
--- branches/gnome-2-24/client/gvfsfusedaemon.c	(original)
+++ branches/gnome-2-24/client/gvfsfusedaemon.c	Mon Oct 20 08:42:27 2008
@@ -749,7 +749,7 @@
       if (g_file_info_has_attribute (file_info, G_FILE_ATTRIBUTE_UNIX_BLOCKS))
 	sbuf->st_blocks = file_info_get_attribute_as_uint (file_info, G_FILE_ATTRIBUTE_UNIX_BLOCKS);
       else /* fake it to make 'du' work like 'du --apparent'. */
-	sbuf->st_blocks = (sbuf->st_size + 1) / 512;
+	sbuf->st_blocks = (sbuf->st_size + 511) / 512;
 
       /* Setting st_nlink to 1 for directories makes 'find' work */
       sbuf->st_nlink = 1;

Modified: branches/gnome-2-24/daemon/gvfsbackendcomputer.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsbackendcomputer.c	(original)
+++ branches/gnome-2-24/daemon/gvfsbackendcomputer.c	Mon Oct 20 08:42:27 2008
@@ -726,10 +726,9 @@
 
   if (file != &root)
     {
-      if (file != NULL)
-        g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
-                          G_IO_ERROR_NOT_SUPPORTED,
-                          _("Can't open mountable file"));
+      g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+			G_IO_ERROR_NOT_SUPPORTED,
+			_("Not supported"));
       
       return TRUE;
     }