diff src/main.c @ 113:55166d93498d

Fri Nov 24 21:37:01 2006 John Ellis <[e-mail]> * configure.in: Add test for lcms (little cms). * Makefile.am: Add color-man.[ch]: * color-man.[ch]: New files for color management support. * globals.c, gqview.h, main.c, rcfile.c, typedefs.h: Add color profile variables and option saving. * image.[ch]: Add color profile functions. * layout.c, layout_image.[ch]: Add color profile icon, popup menu, and fix sort menu to use radio buttons. * menu.c: Use radio buttons for sort menu when appropriate. * preferences.c: Add color profile options to preferences. * ui_menu.[ch]: Add menu_item_add_radio() for radio item menus. * ui_misc.c: Fix gtk_table_attach() arg for vertical expansion. * view_file_icon.c, view_file_list.c: Check for active state in sort menu callbacks. * README: Add info about lcms, and how to disable.

--- a/src/main.c	Sat Nov 18 00:12:22 2006 +0000
+++ b/src/main.c	Sat Nov 25 03:00:33 2006 +0000
@@ -1127,6 +1127,12 @@
 
 	g_free(safe_delete_path);
 	safe_delete_path = concat_dir_and_file(homedir(), GQVIEW_RC_DIR_TRASH);
+
+	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
+		{
+		color_profile_input_file[i] = NULL;
+		color_profile_input_name[i] = NULL;
+		}
 }
 
 static void exit_gqview_final(void)
@@ -1161,6 +1167,11 @@
 	layout_tools_float_get(NULL, &tools_float, &tools_hidden);
 	toolbar_hidden = layout_toolbar_hidden(NULL);
 
+	color_profile_enabled = layout_image_color_profile_get_use(NULL);
+	layout_image_color_profile_get(NULL,
+				       &color_profile_input_type, &color_profile_screen_type,
+				       &color_profile_use_image);
+
 	save_options();
 	keys_save();