Index: rhythmdb/rhythmdb.c
===================================================================
--- rhythmdb/rhythmdb.c	(revision 4985)
+++ rhythmdb/rhythmdb.c	(working copy)
@@ -3164,8 +3164,18 @@
 	res = gnome_vfs_find_directory (uri,
 					GNOME_VFS_DIRECTORY_KIND_TRASH,
 					&trash,
-					TRUE, TRUE,
+					FALSE, TRUE,
 					0);
+
+        if (res == GNOME_VFS_ERROR_NOT_SUPPORTED) {
+                /* Didn't find trash, try to create */
+                res = gnome_vfs_find_directory (uri,
+                                                GNOME_VFS_DIRECTORY_KIND_TRASH,
+                                                &trash,
+                                                TRUE, FALSE,
+                                                0);
+        }
+
 	if (res != GNOME_VFS_OK || trash == NULL) {
 		/* If the file doesn't exist, or trash isn't support,
 		 * remove it from the db */
@@ -3176,6 +3186,8 @@
 			rhythmdb_entry_move_to_trash_set_error (db, entry, -1);
 		}
 
+                /* XXX: Should we just unlink the file instead of letting it
+                 * hang around, potentially on a small flash disk? */
 		gnome_vfs_uri_unref (uri);
 		return;
 	}
