diff -u nautilus-2.22.2/debian/patches/series nautilus-2.22.2/debian/patches/series
--- nautilus-2.22.2/debian/patches/series
+++ nautilus-2.22.2/debian/patches/series
@@ -10,7 +10,7 @@
 15_translations_list_update.patch
 # those changes need to be updated to the new nautilus
 #08_display_mimetype_warning.patch
-#80_suppress_umount_in_ltsp.patch
+80_suppress_umount_in_ltsp.patch
 #81_gnome-app-install.patch
 90_from_upstream_fix_autorun.patch
 99_ltmain_as-needed.patch -p0
diff -u nautilus-2.22.2/debian/patches/80_suppress_umount_in_ltsp.patch nautilus-2.22.2/debian/patches/80_suppress_umount_in_ltsp.patch
--- nautilus-2.22.2/debian/patches/80_suppress_umount_in_ltsp.patch
+++ nautilus-2.22.2/debian/patches/80_suppress_umount_in_ltsp.patch
@@ -1,53 +1,25 @@
-diff -Nur nautilus-2.15.91/src/file-manager/fm-directory-view.c nautilus-2.15.91.new/src/file-manager/fm-directory-view.c
---- nautilus-2.15.91/src/file-manager/fm-directory-view.c	2006-08-21 18:52:31.000000000 +0200
-+++ nautilus-2.15.91.new/src/file-manager/fm-directory-view.c	2006-08-21 18:54:05.000000000 +0200
-@@ -7282,27 +7282,31 @@
- 	*show_format = FALSE;
+--- nautilus-2.22.2/libnautilus-private/nautilus-file.c	2008-04-04 19:04:07.000000000 +0200
++++ nautilus-file.c	2008-04-22 12:47:41.000000000 +0200
+@@ -873,6 +873,10 @@
+ {
+ 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
  
- 	if (nautilus_file_has_volume (file)) {
--		*show_unmount = TRUE;
--
--		volume = nautilus_file_get_volume (file);
--                drive = gnome_vfs_volume_get_drive (volume);
--		if (drive)
--		    *show_eject = gnome_vfs_drive_needs_eject (drive);
--		else
--		    *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
--	} else if (nautilus_file_has_drive (file)) {
--		drive = nautilus_file_get_drive (file);
--		*show_eject = gnome_vfs_drive_needs_eject (drive);
--		if (gnome_vfs_drive_is_mounted (drive)) {
-+		if (getenv("LTSP_CLIENT") == NULL) {
- 			*show_unmount = TRUE;
--		} else {
--			*show_mount = TRUE;
++	if (getenv("LTSP_CLIENT")) {
++		return FALSE;
++	}
 +
-+			volume = nautilus_file_get_volume (file);
-+                	drive = gnome_vfs_volume_get_drive (volume);
-+			if (drive)
-+			    *show_eject = gnome_vfs_drive_needs_eject (drive);
-+			else
-+			    *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
- 		}
-+	} else if (nautilus_file_has_drive (file)) {
-+		if (getenv("LTSP_CLIENT") == NULL) {
-+			drive = nautilus_file_get_drive (file);
-+			*show_eject = gnome_vfs_drive_needs_eject (drive);
-+			if (gnome_vfs_drive_is_mounted (drive)) {
-+				*show_unmount = TRUE;
-+			} else {
-+				*show_mount = TRUE;
-+			}
+ 	return file->details->can_unmount ||
+ 		(file->details->mount != NULL &&
+ 		 g_mount_can_unmount (file->details->mount));
+@@ -883,6 +887,10 @@
+ {
+ 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
  
--		if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
--		    !gnome_vfs_drive_is_mounted (drive) &&
--		    g_find_program_in_path ("gfloppy")) {
--			*show_format = TRUE;
-+			if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY &&
-+			    !gnome_vfs_drive_is_mounted (drive) &&
-+			    g_find_program_in_path ("gfloppy")) {
-+				*show_format = TRUE;
-+			}
- 		}
- 	} else if (nautilus_file_is_nautilus_link (file)) {
- 		uri = nautilus_file_get_activation_uri (file);
++	if (getenv("LTSP_CLIENT")) {
++		return FALSE;
++	}
++
+ 	return file->details->can_eject ||
+ 		(file->details->mount != NULL &&
+ 		 g_mount_can_eject (file->details->mount));
+
diff -u nautilus-2.22.2/debian/changelog nautilus-2.22.2/debian/changelog
--- nautilus-2.22.2/debian/changelog
+++ nautilus-2.22.2/debian/changelog
@@ -1,3 +1,11 @@
+nautilus (1:2.22.2-0ubuntu5) hardy-proposed; urgency=low
+
+  * debian/patches/80_suppress_umount_in_ltsp.patch:
+    - update from Oliver Grawert to make lstp clients not list unmount and eject
+      actions as that was the case before the gio changes (lp: #220564)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 29 Apr 2008 15:28:57 +0200
+
 nautilus (1:2.22.2-0ubuntu4) hardy; urgency=low
 
   * debian/patches/90_from_upstream_fix_autorun.patch: