nautilus r15053 - in trunk: . src src/file-manager

[alexl svn gnome org]

Author: alexl
Date: Wed Mar  4 18:52:12 2009
New Revision: 15053
URL: http://svn.gnome.org/viewvc/nautilus?rev=15053&view=rev

Log:
2009-03-04  Alexander Larsson  <alexl redhat com>

	Bug 574067 â context menu lists eject and unmount option

        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-tree-view.c:
        * src/nautilus-places-sidebar.c:
	Never show unmount menu item if we're showing eject, as its a superset
	of unmount.



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c
   trunk/src/file-manager/fm-tree-view.c
   trunk/src/nautilus-places-sidebar.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Wed Mar  4 18:52:12 2009
@@ -7103,9 +7103,7 @@
 
 	if (nautilus_file_can_eject (file)) {
 		*show_eject = TRUE;
-	}
-
-	if (nautilus_file_can_unmount (file)) {
+	} else if (nautilus_file_can_unmount (file)) {
 		*show_unmount = TRUE;
 	}
 
@@ -7152,9 +7150,7 @@
 	
 	if (nautilus_file_can_eject (file)) {
 		*show_eject = TRUE;
-	}
-
-	if (nautilus_file_can_unmount (file)) {
+	} else if (nautilus_file_can_unmount (file)) {
 		*show_unmount = TRUE;
 	}
 	

Modified: trunk/src/file-manager/fm-tree-view.c
==============================================================================
--- trunk/src/file-manager/fm-tree-view.c	(original)
+++ trunk/src/file-manager/fm-tree-view.c	Wed Mar  4 18:52:12 2009
@@ -738,6 +738,9 @@
 			/* TODO: show both unmount and eject if there are more than one volume for the drive */
 			show_unmount = g_mount_can_unmount (mount);
 			show_eject = g_mount_can_eject (mount);
+			if (show_eject) {
+				show_unmount = FALSE;
+			}
 		} 
 		
 		if (show_unmount) {

Modified: trunk/src/nautilus-places-sidebar.c
==============================================================================
--- trunk/src/nautilus-places-sidebar.c	(original)
+++ trunk/src/nautilus-places-sidebar.c	Wed Mar  4 18:52:12 2009
@@ -1286,8 +1286,10 @@
 		*show_eject |= g_volume_can_eject (volume);
 	}
 	if (mount != NULL) {
-		*show_unmount = g_mount_can_unmount (mount);
 		*show_eject |= g_mount_can_eject (mount);
+		if (!*show_eject) {
+			*show_unmount = g_mount_can_unmount (mount);
+		}
 	}
 }