Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving
authorAlexander Larsson <alexl@redhat.com>
Thu, 27 Mar 2008 20:13:00 +0000 (20:13 +0000)
committerAlexander Larsson <alexl@src.gnome.org>
Thu, 27 Mar 2008 20:13:00 +0000 (20:13 +0000)
commit9dfce3a26a37c46cb00d323230ed0885c43b55f1
tree22917ec85274d7a3b7bb6bd12bf2c9096c92afc6
parentd7d4211cb057e3ebe4aeaf48b2326b667e35db11
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
gio/ChangeLog
gio/glocalfile.c