Index: rhythmdb/rhythmdb.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmdb/rhythmdb.c,v
retrieving revision 1.140
diff -u -u -r1.140 rhythmdb.c
--- rhythmdb/rhythmdb.c	2 Dec 2005 12:42:32 -0000	1.140
+++ rhythmdb/rhythmdb.c	3 Dec 2005 12:07:57 -0000
@@ -1371,14 +1371,8 @@
 	if (entry) {
 		time_t mtime = (time_t) entry->mtime;
 		if (event->error) {
-			const char *mount_point;
-
-			/* First check if the mount point the song was on 
-			 * still exists */
-			mount_point = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_MOUNTPOINT);
-			if ((rb_uri_is_mounted (mount_point) == FALSE) && !is_ghost_entry (entry)) {
+			if (!is_ghost_entry (entry)) {
 				rhythmdb_entry_set_visibility (db, entry, FALSE);
-				
 			} else {
 				rb_debug ("error accessing %s: %s", event->real_uri,
 					  event->error->message);
@@ -1587,7 +1581,7 @@
 
 	if (entry) {
 		rb_debug ("deleting entry for %s", event->uri);
-		rhythmdb_entry_delete (db, entry);
+		rhythmdb_entry_set_visibility (db, entry, FALSE);
 	} else {
 		rb_debug ("no entry for %s", event->uri);
 	}
@@ -2581,7 +2575,7 @@
 		 * remove it from the db */
 		if (res == GNOME_VFS_ERROR_NOT_FOUND ||
 		    res == GNOME_VFS_ERROR_NOT_SUPPORTED) {
-			rhythmdb_entry_delete (db, entry);
+			rhythmdb_entry_set_visibility (db, entry, FALSE);
 		} else {
 			rhythmbd_entry_move_to_trash_set_error (db, entry, -1);
 		}
@@ -2630,7 +2624,7 @@
 			entry);
 
 	if (res == GNOME_VFS_OK) {
-		rhythmdb_entry_delete (db, entry);
+		rhythmdb_entry_set_visibility (db, entry, FALSE);
 	} else {
 		rhythmbd_entry_move_to_trash_set_error (db, entry, res);
 	}
