Update for string_list set/get preferences changes.

	* components/tree/nautilus-tree-expansion-state.c:
	(expansion_state_load_callback),
	(nautilus_tree_expansion_state_load_from_preferences),
	(nautilus_tree_expansion_state_save_to_preferences),
	(nautilus_tree_expansion_state_initialize),
	(nautilus_tree_expansion_state_save):
	Update for string_list set/get preferences changes.

	* libnautilus-extensions/nautilus-gconf-extensions.h:
	* libnautilus-extensions/nautilus-gconf-extensions.c:
	(nautilus_gconf_set_string_list), (nautilus_gconf_get_string_list):
	Use GSList instead of GList as this the format that GConf
	understands.

	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-preferences.c:
	(nautilus_preferences_set_string_list),
	(nautilus_preferences_get_string_list),
	(nautilus_preferences_default_set_string_list),
	(nautilus_preferences_default_get_string_list),
	(preferences_entry_remove_callback),
	(preferences_entry_remove_auto_storage),
	(nautilus_self_check_preferences):
	Use EelStringList instead of GList for string_list preferences.

	* src/nautilus-shell.c: (save_window_states),
	(restore_one_window_callback), (restore_window_states):
	Update for string_list set/get preferences changes.  Simplify a
	little by using a string list iterator and string lists instead of
	parsing the geometry strings "by hand."

1 files changed, 34 insertions, 17 deletions

diff --git a/libnautilus-private/nautilus-preferences.c b/libnautilus-private/nautilus-preferences.c
index 736e69cce..028e7bde5 100644
--- a/libnautilus-private/nautilus-preferences.c
+++ b/libnautilus-private/nautilus-preferences.c
@@ -484,33 +484,41 @@ nautilus_preferences_get (const char *name)
 
 void
 nautilus_preferences_set_string_list (const char *name,
-				      GList *string_list_value)
+				      const EelStringList *string_list_value)
 {
 	char *key;
+	GSList *slist;
 
 	g_return_if_fail (name != NULL);
 	g_return_if_fail (preferences_is_initialized ());
-	
+
+	slist = eel_string_list_as_g_slist (string_list_value);
+
 	key = preferences_key_make (name);
-	nautilus_gconf_set_string_list (key, string_list_value);
+	nautilus_gconf_set_string_list (key, slist);
 	g_free (key);
 
+	eel_g_slist_free_deep (slist);
+
 	nautilus_gconf_suggest_sync ();
 }
 
-GList *
+EelStringList *
 nautilus_preferences_get_string_list (const char *name)
 {
- 	GList *result;
+ 	EelStringList *result;
 	char *key;
+	GSList *slist;
 	
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (preferences_is_initialized (), NULL);
 	
 	key = preferences_key_make_for_getter (name);
-	result = nautilus_gconf_get_string_list (key);
+	slist = nautilus_gconf_get_string_list (key);
 	g_free (key);
 
+	result = eel_string_list_new_from_g_slist (slist, TRUE);
+	eel_g_slist_free_deep (slist);
 	return result;
 }
 
@@ -650,32 +658,41 @@ nautilus_preferences_default_get_string (const char *name,
 void
 nautilus_preferences_default_set_string_list (const char *name,
 					      int user_level,
-					      GList *string_list_value)
+					      const EelStringList *string_list_value)
 {
 	char *default_key;
+	GSList *slist;
 	
 	g_return_if_fail (name != NULL);
 	g_return_if_fail (preferences_is_initialized ());
+
+	slist = eel_string_list_as_g_slist (string_list_value);
 	
 	default_key = preferences_key_make_for_default (name, user_level);
-	nautilus_gconf_set_string_list (default_key, string_list_value);
+	nautilus_gconf_set_string_list (default_key, slist);
 	g_free (default_key);
+
+	eel_g_slist_free_deep (slist);
 }
 
-GList *
+EelStringList *
 nautilus_preferences_default_get_string_list (const char *name,
 					      int user_level)
 {
- 	GList *result;
+ 	EelStringList *result;
 	char *default_key;
+	GSList *slist;
 	
 	g_return_val_if_fail (name != NULL, NULL);
 	g_return_val_if_fail (preferences_is_initialized (), NULL);
 	
 	default_key = preferences_key_make_for_default (name, user_level);
-	result = nautilus_gconf_get_string_list (default_key);
+	slist = nautilus_gconf_get_string_list (default_key);
 	g_free (default_key);
 
+	result = eel_string_list_new_from_g_slist (slist, TRUE);
+	eel_g_slist_free_deep (slist);
+
 	return result;
 }
 
@@ -992,7 +1009,7 @@ preferences_entry_remove_callback (PreferencesEntry *entry,
 				   gpointer callback_data)
 {
 	GList *new_list;
-	GList *iterator;
+	const GList *node;
 
 	g_return_if_fail (entry != NULL);
 	g_return_if_fail (callback != NULL);
@@ -1000,8 +1017,8 @@ preferences_entry_remove_callback (PreferencesEntry *entry,
 	
 	new_list = g_list_copy (entry->callback_list);
 	
-	for (iterator = new_list; iterator != NULL; iterator = iterator->next) {
-		PreferencesCallbackEntry *callback_entry = iterator->data;
+	for (node = new_list; node != NULL; node = node->next) {
+		PreferencesCallbackEntry *callback_entry = node->data;
 		
 		g_return_if_fail (callback_entry != NULL);
 		
@@ -1031,7 +1048,7 @@ preferences_entry_remove_auto_storage (PreferencesEntry *entry,
 				       gpointer storage)
 {
 	GList *new_list;
-	GList *iterator;
+	const GList *node;
 	gpointer storage_in_entry;
 
 	g_return_if_fail (entry != NULL);
@@ -1040,8 +1057,8 @@ preferences_entry_remove_auto_storage (PreferencesEntry *entry,
 	
 	new_list = g_list_copy (entry->auto_storage_list);
 	
-	for (iterator = new_list; iterator != NULL; iterator = iterator->next) {
-		storage_in_entry = iterator->data;
+	for (node = new_list; node != NULL; node = node->next) {
+		storage_in_entry = node->data;
 		
 		g_return_if_fail (storage_in_entry != NULL);