From 0d779454099b09e89897adaa72e5f2e68d4815e3 Mon Sep 17 00:00:00 2001
From: Jan Rinze <Jan Rinze@localhost>
Date: Thu, 9 Dec 2010 20:18:01 +0100
Subject: [PATCH] fix number of bools used by hsv sliders and fix icc dir
 setting

---
 rtgui/paramsedited.h | 6 +++---
 rtgui/preferences.cc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index b0daec1b1..7939448ff 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -265,9 +265,9 @@ class HSVEqualizerParamsEdited {
 	
 public:
 	bool enabled;
-	bool sat[6];
-	bool val[6];
-	bool hue[6];
+	bool sat[8];
+	bool val[8];
+	bool hue[8];
 	int	hsvchannel;
 };
 
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 56b7d7f15..e42e9ce92 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -735,7 +735,7 @@ void Preferences::storePreferences () {
 
 
     moptions.rtSettings.monitorProfile      = monProfile->get_filename ();
-	moptions.rtSettings.iccDirectory        = iccDir->get_filename ();
+	moptions.rtSettings.iccDirectory        = iccDir->get_current_folder ();
 	moptions.rtSettings.colorimetricIntent  = intent->get_active_row_number ();
 
     if (sdcurrent->get_active ()) 
@@ -799,7 +799,7 @@ void Preferences::fillPreferences () {
     if (Glib::file_test (moptions.rtSettings.monitorProfile, Glib::FILE_TEST_EXISTS)) 
         monProfile->set_filename (moptions.rtSettings.monitorProfile);
     if (Glib::file_test (moptions.rtSettings.iccDirectory, Glib::FILE_TEST_IS_DIR)) 
-        iccDir->set_filename (moptions.rtSettings.iccDirectory);
+        iccDir->set_current_folder (moptions.rtSettings.iccDirectory);
 	intent->set_active (moptions.rtSettings.colorimetricIntent);
     languages->set_active_text (moptions.language);
     theme->set_active_text (moptions.theme);