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

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 25 15:12:35 2008
New Revision: 13817
URL: http://svn.gnome.org/viewvc/nautilus?rev=13817&view=rev

Log:
2008-02-25  Alexander Larsson  <alexl redhat com>

        * src/file-manager/fm-properties-window.c:
	Don't show permissions for computer.
	Make "open with tab" consistent for computer and trash.
	Patch from Cosimo Cecchi (#518131)



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-properties-window.c

Modified: trunk/src/file-manager/fm-properties-window.c
==============================================================================
--- trunk/src/file-manager/fm-properties-window.c	(original)
+++ trunk/src/file-manager/fm-properties-window.c	Mon Feb 25 15:12:35 2008
@@ -2552,6 +2552,19 @@
 }
 
 static gboolean
+is_computer_directory (NautilusFile *file)
+{
+	char *file_uri;
+	gboolean result;
+	
+	file_uri = nautilus_file_get_uri (file);
+	result = strcmp (file_uri, "computer:///") == 0;
+	g_free (file_uri);
+	
+	return result;
+}
+
+static gboolean
 should_show_custom_icon_buttons (FMPropertiesWindow *window) 
 {
 	if (is_multi_file_window (window)) {
@@ -4814,11 +4827,16 @@
 static gboolean
 should_show_permissions (FMPropertiesWindow *window) 
 {
-	/* Don't show permissions for the Trash since it's not
-	 * really a file system object.
+	NautilusFile *file;
+
+	file = get_target_file (window);
+
+	/* Don't show permissions for Trash and Computer since they're not
+	 * really file system objects.
 	 */
 	if (!is_multi_file_window (window)
-	    && is_merged_trash_directory (get_target_file (window))) {
+	    && (is_merged_trash_directory (file) ||
+		is_computer_directory (file))) {
 		return FALSE;
 	}
 
@@ -4921,7 +4939,9 @@
 {
 	if (file == NULL ||
 	    NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
-	    nautilus_file_is_nautilus_link (file)) {
+	    nautilus_file_is_nautilus_link (file) ||
+	    is_merged_trash_directory (file) ||
+	    is_computer_directory (file)) {
 		return TRUE;
 	}
 	return FALSE;