[gnome-color-manager] Ensure the print profile mode is set in the calibration dialog



commit 7ccdbc0da05b5ba4722e6ef46084eafafed450e8
Author: Richard Hughes <richard hughsie com>
Date:   Tue May 29 16:58:25 2012 +0100

    Ensure the print profile mode is set in the calibration dialog
    
    Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=671373

 src/gcm-calibrate-argyll.c |    1 +
 src/gcm-calibrate-main.c   |    5 +++++
 src/gcm-calibrate.c        |    5 ++++-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 5b953ff..ee07594 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -1703,6 +1703,7 @@ gcm_calibrate_argyll_printer (GcmCalibrate *calibrate,
 		      "basename", &basename,
 		      "print-kind", &print_kind,
 		      NULL);
+	g_assert (print_kind != GCM_CALIBRATE_PRINT_KIND_UNKNOWN);
 	working_path = gcm_calibrate_get_working_path (GCM_CALIBRATE (calibrate_argyll));
 
 	/* print */
diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c
index 511f7fe..fc989c4 100644
--- a/src/gcm-calibrate-main.c
+++ b/src/gcm-calibrate-main.c
@@ -1613,6 +1613,11 @@ gcm_calib_setup_page_print_kind (GcmCalibratePriv *calib)
 			  G_CALLBACK (gcm_calib_print_kind_toggled_cb), calib);
 	gtk_box_pack_start (GTK_BOX (content), widget, FALSE, FALSE, 0);
 
+	/* sync the default */
+	g_object_set (calib->calibrate,
+		      "print-kind", GCM_CALIBRATE_PRINT_KIND_LOCAL,
+		      NULL);
+
 	/* add to assistant */
 	gtk_assistant_append_page (assistant, vbox);
 	gtk_assistant_set_page_type (assistant, vbox, GTK_ASSISTANT_PAGE_CONTENT);
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index df242e4..acc611f 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -2316,6 +2316,9 @@ gcm_calibrate_set_property (GObject *object, guint prop_id, const GValue *value,
 	case PROP_DISPLAY_KIND:
 		priv->display_kind = g_value_get_uint (value);
 		break;
+	case PROP_PRINT_KIND:
+		priv->print_kind = g_value_get_uint (value);
+		break;
 	case PROP_REFERENCE_KIND:
 		priv->reference_kind = g_value_get_uint (value);
 		break;
@@ -2356,7 +2359,7 @@ gcm_calibrate_class_init (GcmCalibrateClass *klass)
 
 	pspec = g_param_spec_uint ("print-kind", NULL, NULL,
 				   0, G_MAXUINT, 0,
-				   G_PARAM_READABLE);
+				   G_PARAM_READWRITE);
 	g_object_class_install_property (object_class, PROP_PRINT_KIND, pspec);
 
 	pspec = g_param_spec_uint ("device-kind", NULL, NULL,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]