diff -p -up nautilus-2.31.92/libnautilus-private/nautilus-directory-async.c.kdedesktop nautilus-2.31.92/libnautilus-private/nautilus-directory-async.c
--- nautilus-2.31.92/libnautilus-private/nautilus-directory-async.c.kdedesktop	2010-09-11 16:05:51.000000000 +0200
+++ nautilus-2.31.92/libnautilus-private/nautilus-directory-async.c	2010-09-13 11:22:48.000000000 +0200
@@ -2227,10 +2227,24 @@ 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 ("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.31.92/src/nautilus-application.c.kdedesktop nautilus-2.31.92/src/nautilus-application.c
--- nautilus-2.31.92/src/nautilus-application.c.kdedesktop	2010-09-13 11:22:48.000000000 +0200
+++ nautilus-2.31.92/src/nautilus-application.c	2010-09-13 11:25:48.000000000 +0200
@@ -909,6 +909,8 @@ nautilus_application_startup (NautilusAp
 		return;
 	}
 
+	nautilus_set_kde_trash_name ("trash.desktop");
+
 	if (kill_shell) {
 		if (unique_app_is_running (application->unique_app)) {
 			unique_app_send_message (application->unique_app,