Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving

2008-03-27  Alexander Larsson  <alexl@redhat.com>

	* glocalfile.c (g_local_file_move):
	Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving
	file over directory. This is according to the docs and what the move via
	copy+remove fallback does.

svn path=/trunk/; revision=6758

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 5672475920f94f7d614aeeec49c7639e0d7013f3..3365cedea338f89019cb9bc2d79291ea8ee3dfd8 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27  Alexander Larsson  <alexl@redhat.com>
+
+       * glocalfile.c (g_local_file_move):
+       Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving
+       file over directory. This is according to the docs and what the move via
+       copy+remove fallback does.
+
 2008-03-27  Lin Ma  <Lin.Ma@Sun.COM>
 
        * fen/*.[hc]: Updated copyright.

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 03e86699431fd1a67dab1e004deb7d51f3db8df5..529d80837248042cf6a22c338381c167aebba15d 100644 (file)
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -2078,9 +2078,8 @@ g_local_file_move (GFile                  *source,
                   g_strerror (errsv));
       return FALSE;
     }
-  else
-    source_is_dir = S_ISDIR (statbuf.st_mode);
 
+  source_is_dir = S_ISDIR (statbuf.st_mode);
   source_size = statbuf.st_size;
   
   destination_exist = FALSE;
@@ -2094,10 +2093,16 @@ g_local_file_move (GFile                  *source,
          /* Always fail on dirs, even with overwrite */
          if (S_ISDIR (statbuf.st_mode))
            {
-             g_set_error (error,
-                          G_IO_ERROR,
-                          G_IO_ERROR_WOULD_MERGE,
-                          _("Can't move directory over directory"));
+             if (source_is_dir)
+               g_set_error (error,
+                            G_IO_ERROR,
+                            G_IO_ERROR_WOULD_MERGE,
+                            _("Can't move directory over directory"));
+              else
+               g_set_error (error,
+                            G_IO_ERROR,
+                            G_IO_ERROR_IS_DIRECTORY,
+                            _("File is directory"));
              return FALSE;
            }
        }