[gnome-color-manager] Ask for the chart type first before we ask for calibration files
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Ask for the chart type first before we ask for calibration files
- Date: Mon, 8 Feb 2010 22:24:34 +0000 (UTC)
commit bbae3e59be1df09465eacd3d7381bd176dc0ced4
Author: Pascal de Bruijn <pmjdebruijn pcode nl>
Date: Mon Feb 8 22:23:55 2010 +0000
Ask for the chart type first before we ask for calibration files
Signed-off-by: Richard Hughes <richard hughsie com>
src/gcm-prefs.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index c628658..1f17283 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -802,6 +802,14 @@ gcm_prefs_calibrate_device (GcmCalibrate *calibrate)
"manufacturer", &manufacturer,
NULL);
+ /* set the reference kind */
+ reference_kind = gcm_prefs_get_reference_kind ();
+ if (reference_kind == GCM_CALIBRATE_ARGYLL_REFERENCE_KIND_UNKNOWN) {
+ ret = FALSE;
+ goto out;
+ }
+ gcm_calibrate_argyll_set_reference_kind (GCM_CALIBRATE_ARGYLL (calibrate), reference_kind);
+
/* get scanned image */
directory = g_get_home_dir ();
scanned_image = gcm_prefs_calibrate_device_get_scanned_profile (directory);
@@ -814,14 +822,6 @@ gcm_prefs_calibrate_device (GcmCalibrate *calibrate)
if (reference_data == NULL)
goto out;
- /* set the reference kind */
- reference_kind = gcm_prefs_get_reference_kind ();
- if (reference_kind == GCM_CALIBRATE_ARGYLL_REFERENCE_KIND_UNKNOWN) {
- ret = FALSE;
- goto out;
- }
- gcm_calibrate_argyll_set_reference_kind (GCM_CALIBRATE_ARGYLL (calibrate), reference_kind);
-
/* ensure we have data */
basename = gcm_prefs_calibrate_get_basename (current_device);
if (manufacturer == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]