diff src/main.c @ 327:049d6b00cc14

Rename color profile options.

--- a/src/main.c	Sat Apr 12 07:46:01 2008 +0000
+++ b/src/main.c	Sat Apr 12 08:05:44 2008 +0000
@@ -1174,8 +1174,8 @@
 
 	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
 		{
-		options->color_profile_input_file[i] = NULL;
-		options->color_profile_input_name[i] = NULL;
+		options->color_profile.input_file[i] = NULL;
+		options->color_profile.input_name[i] = NULL;
 		}
 
 	options->fullscreen.info = g_strdup("%collection%(%number%/%total%) <b>%name%</b>\n"
@@ -1209,7 +1209,7 @@
 
 	layout_geometry_get_dividers(NULL, &options->window_hdivider_pos, &options->window_vdivider_pos);
 
-	layout_views_get(NULL, &options->layout_view_tree, &options->layout_view_icons);
+	layout_views_get(NULL, &options->layout.view_as_tree, &options->layout.view_as_icons);
 
 	options->thumbnails_enabled = layout_thumb_get(NULL);
 	layout_sort_get(NULL, &options->file_sort_method, &options->file_sort_ascending);
@@ -1219,11 +1219,11 @@
 	layout_tools_float_get(NULL, &options->tools_float, &options->tools_hidden);
 	options->toolbar_hidden = layout_toolbar_hidden(NULL);
 
-	options->color_profile_enabled = layout_image_color_profile_get_use(NULL);
+	options->color_profile.enabled = layout_image_color_profile_get_use(NULL);
 	layout_image_color_profile_get(NULL,
-				       &options->color_profile_input_type,
-				       &options->color_profile_screen_type,
-				       &options->color_profile_use_image);
+				       &options->color_profile.input_type,
+				       &options->color_profile.screen_type,
+				       &options->color_profile.use_image);
 
 	save_options();
 	keys_save();
@@ -1324,7 +1324,7 @@
 	printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
 #endif
 	options = init_options(NULL);
-	options->layout_order = g_strdup("123"); /* TODO: move to init_options() */
+	options->layout.order = g_strdup("123"); /* TODO: move to init_options() */
 	setup_default_options();
 	load_options();