nautilus r13854 - trunk/src

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Feb 29 10:54:24 2008
New Revision: 13854
URL: http://svn.gnome.org/viewvc/nautilus?rev=13854&view=rev

Log:
2008-02-29  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-file-management-properties.c:
	(update_icon_captions_from_gconf):
	Fix a crasher when reading NULL values from GConf. (#518974)


Modified:
   trunk/src/nautilus-file-management-properties.c

Modified: trunk/src/nautilus-file-management-properties.c
==============================================================================
--- trunk/src/nautilus-file-management-properties.c	(original)
+++ trunk/src/nautilus-file-management-properties.c	Fri Feb 29 10:54:24 2008
@@ -387,6 +387,8 @@
 	int i, j;
 
 	captions = eel_preferences_get_string_array (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS);
+	if (captions == NULL)
+		return;
 
 	for (i = 0, j = 0; 
 	     icon_captions_components[i] != NULL;