[nautilus/gnome-2-32: 76/283] Don't add the emblem if it's equal to the icon.

[Cosimo Cecchi <cosimoc src gnome org>]

commit f98f77577aa0df30358f3ead6f9b88e5cf2851a8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun May 9 20:28:32 2010 +0200

    Don't add the emblem if it's equal to the icon.

 libnautilus-private/nautilus-file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index c484901..b69ba00 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4147,7 +4147,7 @@ nautilus_file_get_gicon (NautilusFile *file,
 			g_object_unref (icon);
 			icon = mount_icon;
 		} else if ((flags & NAUTILUS_FILE_ICON_FLAGS_USE_MOUNT_ICON_AS_EMBLEM) &&
-			     mount_icon != NULL) {
+			     mount_icon != NULL && !g_icon_equal (mount_icon, icon)) {
 
 			emblem = g_emblem_new (mount_icon);
 			emblemed_icon = g_emblemed_icon_new (icon, emblem);