[Nautilus-list] Patch for #74910: nautilus shouldn't display file information for .desktop files

[Benedikt Roth <Benedikt Roth gmx net>]

Regards,

	Benedikt

? nautilus.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5233
diff -p -u -r1.5233 ChangeLog
--- ChangeLog	22 Apr 2002 13:05:00 -0000	1.5233
+++ ChangeLog	23 Apr 2002 14:32:25 -0000
@@ -1,3 +1,10 @@
+2002-04-23  Benedikt Roth  <Benedikt Roth gmx net>
+
+	* src/file-manager/fm-icon-container.c:
+	(fm_icon_container_get_icon_text): 
+	Also don't display additional information for .desktop 
+	files in vfolders like applications:. (#74910)
+
 2002-04-22  Anders Carlsson  <andersca gnu org>
 
 	* libnautilus-private/nautilus-icon-container.c:
Index: src/file-manager/fm-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-container.c,v
retrieving revision 1.1
diff -p -u -r1.1 fm-icon-container.c
--- src/file-manager/fm-icon-container.c	9 Apr 2002 13:51:10 -0000	1.1
+++ src/file-manager/fm-icon-container.c	23 Apr 2002 14:32:26 -0000
@@ -194,7 +194,7 @@ fm_icon_container_get_icon_text (Nautilu
 		/* Strip the suffix for nautilus object xml files. */
 		*editable_text = nautilus_file_get_display_name (file);
 	}
-	
+
 	/* Handle link files specially. */
 	if (nautilus_file_is_nautilus_link (file)) {
 		/* FIXME bugzilla.gnome.org 42531: Does sync. I/O and works only locally. */
@@ -208,8 +208,12 @@ fm_icon_container_get_icon_text (Nautilu
 			if (description)
 				*additional_text = g_strdup_printf (" \n%s\n ", description);
 			g_free (description);
-			return;
 		}
+		/* For vfolders like start-here: or applications: gnome_vfs_get_local_path_from_uri ()
+		 * does not work, so we can't get additional text.
+		 * As the item already is named correctly if this is the case, just return.
+		 */
+		return;
 	}
 	
 	/* Find out what attributes go below each icon. */