gvfs r2281 - in trunk: . daemon/trashlib

[ryanl svn gnome org]

Author: ryanl
Date: Mon Mar  2 17:17:35 2009
New Revision: 2281
URL: http://svn.gnome.org/viewvc/gvfs?rev=2281&view=rev

Log:
2009-03-02  Ryan Lortie  <desrt desrt ca>

        * daemon/trashlib/trashitem.c (trash_item_restore): set 'error' on
        failure.  Fixes a crasher when attempting a restore to somewhere we
        don't have write permissions for.



Modified:
   trunk/ChangeLog
   trunk/daemon/trashlib/trashitem.c

Modified: trunk/daemon/trashlib/trashitem.c
==============================================================================
--- trunk/daemon/trashlib/trashitem.c	(original)
+++ trunk/daemon/trashlib/trashitem.c	Mon Mar  2 17:17:35 2009
@@ -508,7 +508,7 @@
                    G_FILE_COPY_OVERWRITE |
                    G_FILE_COPY_NOFOLLOW_SYMLINKS |
                    G_FILE_COPY_NO_FALLBACK_FOR_MOVE,
-                   NULL, NULL, NULL, NULL))
+                   NULL, NULL, NULL, error))
     {
       g_static_rw_lock_writer_lock (&item->root->lock);
       g_hash_table_remove (item->root->item_table, item->escaped_name);