nautilus r12711 - in trunk: . src src/file-manager

[alexl svn gnome org]

Author: alexl
Date: 2007-01-31 11:29:08 +0000 (Wed, 31 Jan 2007)
New Revision: 12711
ViewCVS link: http://svn.gnome.org/viewcvs/nautilus?rev=12711&view=rev

Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-icon-container.c
   trunk/src/nautilus-file-management-properties.c
Log:
2007-01-31  Alexander Larsson  <alexl redhat com>

	* src/nautilus-file-management-properties.c (update_icon_captions_from_gconf):
	Avoid crashing if not enough items in icon view caption pref (#357955)

	* src/file-manager/fm-icon-container.c (fm_icon_container_get_icon_text):
	Avoid spewing warnings in above case, also some performance fixes.