Patch to fix #321819

[Rodney Dawes <dobey novell com>]

Hey guys,

The emblem size choosing logic in Nautilus is rather problematic at the
moment, allowing the smallest size of the emblem to be the same size as
the icon itself, that the emblem is being attached to. The attached
patch fixes this by using a minimum size of half the icon size, for the
emblem size, allowing more appropriately sized icons to be used, and
allowing theme authors to put correctly sized icons in their themes'
emblems directories, rather than having to kluge around having icons
that are actually smaller than the theme says they are.

Can I please get this committed for 2.16? Thanks.

-- dobey

Index: libnautilus-private/nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.416
diff -u -p -r1.416 nautilus-icon-container.c
--- libnautilus-private/nautilus-icon-container.c	11 Jul 2006 00:57:40 -0000	1.416
+++ libnautilus-private/nautilus-icon-container.c	25 Jul 2006 00:10:04 -0000
@@ -5562,7 +5562,7 @@ nautilus_icon_container_update_icon (Nau
 		emblem_pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
 			(p->data,
 			 NULL,
-			 MIN (icon_size, MAXIMUM_EMBLEM_SIZE),
+			 MIN ((icon_size / 2), MAXIMUM_EMBLEM_SIZE),
 			 NULL,
 			 NULL,
 			 FALSE, FALSE, NULL);