[nautilus] icon-container: don't show comment field for desktop files

[Cosimo Cecchi <cosimoc src gnome org>]

commit afc9a8196ce9a94b900f532c3b7d433ef9641569
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Apr 1 19:51:25 2012 -0400

    icon-container: don't show comment field for desktop files
    
    This fixes a regression introduced in commit
    5a47a484e45218e83202c508b421b1a2707af270
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673316

 src/nautilus-icon-view-container.c |   23 ++++-------------------
 1 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/src/nautilus-icon-view-container.c b/src/nautilus-icon-view-container.c
index ba66cf5..604bd80 100644
--- a/src/nautilus-icon-view-container.c
+++ b/src/nautilus-icon-view-container.c
@@ -310,7 +310,6 @@ nautilus_icon_view_container_get_icon_text (NautilusIconContainer *container,
 					    char                 **additional_text,
 					    gboolean               include_invisible)
 {
-	char *actual_uri;
 	GQuark *attributes;
 	char *text_array[4];
 	int i, j, num_attributes;
@@ -345,27 +344,13 @@ nautilus_icon_view_container_get_icon_text (NautilusIconContainer *container,
 		return;
 	}
 
-	if (NAUTILUS_IS_DESKTOP_ICON_FILE (file)) {
-		/* Don't show the normal extra information for desktop icons, it doesn't
-		 * make sense. */
+	if (NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
+	    nautilus_file_is_nautilus_link (file)) {
+		/* Don't show the normal extra information for desktop icons,
+		 * or desktop files, it doesn't make sense. */
  		*additional_text = NULL;
 		return;
 	}
-	
-	/* Handle link files specially. */
-	if (nautilus_file_is_nautilus_link (file)) {
-		/* FIXME bugzilla.gnome.org 42531: Does sync. I/O and works only locally. */
- 		*additional_text = NULL;
-		if (nautilus_file_is_local (file)) {
-			actual_uri = nautilus_file_get_uri (file);
-			*additional_text = nautilus_link_local_get_additional_text (actual_uri);
-
-			g_free (actual_uri);
-		}
-		/* Don't show the normal extra information for desktop files, it doesn't
-		 * make sense. */
-		return;
-	}
 
 	/* Find out what attributes go below each icon. */
 	attributes = nautilus_icon_view_container_get_icon_text_attribute_names (container,