Re: [Nautilus-list] Nautilus icons size

[Owen Taylor <otaylor redhat com>]

Frederic Crozat <fcrozat mandrakesoft com> writes:

> It seems nautilus desktop icons (Home icon, Trash icons) are not using
> default size 48x48 used by all other GNOME applications.
> 
> Why ? 
> I ask that because when importing GMC desktop, Nautilus icons are not
> correctly aligned with all the others..

Actually, the problem is simply that the imported GMC icons keep
the GMC metadata for positioning, which is never correct when
additional nautilus icons have been added.

In the redhat-outstanding-patches branch, we simply removed
the code that looks for GMC position meta-data.

Regards,
                                        Owen

Index: fm-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.c,v
retrieving revision 1.208.2.6
retrieving revision 1.208.2.7
diff -u -r1.208.2.6 -r1.208.2.7
--- fm-icon-view.c	2001/08/07 18:45:01	1.208.2.6
+++ fm-icon-view.c	2001/08/13 22:25:30	1.208.2.7
@@ -283,9 +283,11 @@
 	char *position_string, *scale_string;
 	gboolean position_good, scale_good;
 	char *locale;
+#ifdef READ_GMC_METADATA
 	char *path, *uri;
 	int res, size;
 	char *buf;
+#endif
 
 	g_assert (NAUTILUS_IS_ICON_CONTAINER (container));
 	g_assert (NAUTILUS_IS_FILE (file));
@@ -310,6 +312,7 @@
 
 	/* If it is the desktop directory, maybe the gnome-libs metadata has information about it */
 
+#ifdef READ_GMC_METADATA
 	if (!position_good) {
 		if (nautilus_file_is_local (file) && nautilus_file_is_in_desktop (file)) {
 			uri = nautilus_file_get_uri (file);
@@ -328,6 +331,7 @@
 			g_free (uri);
 		}
 	}
+#endif	
 	
 	/* Get the scale of the icon from the metadata. */
 	scale_string = nautilus_file_get_metadata