diff -p -up nautilus-2.21.1/libnautilus-private/nautilus-directory-async.c.kdedesktop nautilus-2.21.1/libnautilus-private/nautilus-directory-async.c
--- nautilus-2.21.1/libnautilus-private/nautilus-directory-async.c.kdedesktop	2007-12-20 14:22:58.000000000 +0100
+++ nautilus-2.21.1/libnautilus-private/nautilus-directory-async.c	2008-01-08 11:19:11.000000000 +0100
@@ -2137,10 +2137,27 @@ start_monitoring_file_list (NautilusDire
 			directory->details->hidden_file_hash =
 				g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 		}
-		
-		fn = g_strdup (kde_trash_dir_name);
-		g_hash_table_insert (directory->details->hidden_file_hash,
-				     fn, fn);
+	
+                if (strlen (kde_trash_dir_name) != 0) {        
+        		fn = g_strdup (kde_trash_dir_name);
+	        	g_hash_table_insert (directory->details->hidden_file_hash,
+		        		     fn, fn);
+                }
+               	fn = g_strdup ("Home.desktop");
+ 		g_hash_table_insert (directory->details->hidden_file_hash,
+ 		                     fn, fn);
+ 		fn= g_strdup ("trash.desktop");
+ 		g_hash_table_insert (directory->details->hidden_file_hash,
+ 		                     fn, fn);
+ 		fn = g_strdup ("media.desktop");
+ 		g_hash_table_insert (directory->details->hidden_file_hash,
+ 		                     fn, fn);
+		fn = g_strdup ("System.desktop");
+ 		g_hash_table_insert (directory->details->hidden_file_hash,
+ 		                     fn, fn);
+ 		fn = g_strdup ("device.desktop");
+ 		g_hash_table_insert (directory->details->hidden_file_hash,
+ 		                     fn, fn);
 	}
 
 	
diff -p -up nautilus-2.21.1/src/nautilus-application.c.kdedesktop nautilus-2.21.1/src/nautilus-application.c
--- nautilus-2.21.1/src/nautilus-application.c.kdedesktop	2008-01-08 11:09:28.000000000 +0100
+++ nautilus-2.21.1/src/nautilus-application.c	2008-01-08 11:09:28.000000000 +0100
@@ -481,6 +481,9 @@ initialize_kde_trash_hack (void)
 		if (trash_dir != NULL) {
 			nautilus_set_kde_trash_name (trash_dir);
 		}
+		else {
+			nautilus_set_kde_trash_name ("");
+		}
 
 		g_free (trash_dir);
 	}