Attachment 56645 Details for Bug 115467

[patch] Patch for (3) above

nautilus-115467-dont-overlap-volume-icons.diff (text/plain), 1.24 KB, created by Federico Mena Quintero on 2005-11-08 01:19:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Federico Mena Quintero

Created: 2005-11-08 01:19:03 UTC

Size: 1.24 KB

patch

obsolete

>2005-11-07  Federico Mena Quintero  <federico@ximian.com>
>
>	Fix the volumes part of bug #45953:
>
>	* libnautilus-private/nautilus-icon-container.c
>	(finish_adding_new_icons): First, call assign_icon_position().
>	Then, don't ignore the fact that the icon may have a lazy
>	position; check the icon->has_lazy_position flag even after
>	retrieving its stored position.  If the flag is turned on, defer
>	the icon to the semi_position_icons list.
>
>--- nautilus-2.12.1/libnautilus-private/nautilus-icon-container.c.orig	2005-11-07 18:58:55.000000000 -0600
>+++ nautilus-2.12.1/libnautilus-private/nautilus-icon-container.c	2005-11-07 18:59:17.000000000 -0600
>@@ -5169,10 +5169,10 @@ finish_adding_new_icons (NautilusIconCon
> 	no_position_icons = semi_position_icons = NULL;
> 	for (p = new_icons; p != NULL; p = p->next) {
> 		icon = p->data;
>-		if (!assign_icon_position (container, icon)) {
>+		if (!assign_icon_position (container, icon))
> 			no_position_icons = g_list_prepend (no_position_icons, icon);
>-		} else if (!container->details->auto_layout &&
>-			   icon->has_lazy_position) {
>+
>+		if (!container->details->auto_layout && icon->has_lazy_position) {
> 			semi_position_icons = g_list_prepend (semi_position_icons, icon);
> 		}
> 		finish_adding_icon (container, icon);

Actions: View | Diff

Attachments on bug 115467: 48988 | 48989 | 56444 | 56645