GNOME.org
 

[gnome-color-manager] trivial: fix up GcmCalibrateArgyll to get the correct colorimeter name

commit e0d5dea7a2bcd4298eda69c0d2b0cab1a280ff0e
Author: Richard Hughes <richard hughsie com>
Date:   Thu Aug 5 12:43:38 2010 +0100

    trivial: fix up GcmCalibrateArgyll to get the correct colorimeter name

 src/gcm-calibrate-argyll.c |   88 ++++++++++++++++++++++----------------------
 src/gcm-calibrate-argyll.h |    2 +-
 src/gcm-calibrate-manual.c |    4 +-
 src/gcm-calibrate-manual.h |    2 +-
 src/gcm-calibrate-native.c |    4 +-
 src/gcm-calibrate-native.h |    2 +-
 src/gcm-self-test.c        |    4 +-
 7 files changed, 53 insertions(+), 53 deletions(-)
---
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 8b3cac1..aeb0a4a 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -153,12 +153,12 @@ static guint
 gcm_calibrate_argyll_printer_get_patches (GcmCalibrateArgyll *calibrate_argyll)
 {
 	guint patches = 180;
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 	GcmCalibratePrecision precision;
 
 	/* we care about the kind */
 	g_object_get (calibrate_argyll,
-		      "sensor_client-kind", &sensor_client_kind,
+		      "sensor-kind", &sensor_kind,
 		      "precision", &precision,
 		      NULL);
 
@@ -171,8 +171,8 @@ gcm_calibrate_argyll_printer_get_patches (GcmCalibrateArgyll *calibrate_argyll)
 
 #ifdef USE_DOUBLE_DENSITY
 	/* using double density, so we can double the patch count */
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI ||
-	    sensor_client_kind == GCM_SENSOR_KIND_SPECTRO_SCAN) {
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI ||
+	    sensor_kind == GCM_SENSOR_KIND_SPECTRO_SCAN) {
 		patches *= 2;
 	}
 #endif
@@ -182,51 +182,51 @@ gcm_calibrate_argyll_printer_get_patches (GcmCalibrateArgyll *calibrate_argyll)
 
 #ifdef HAVE_VTE
 /**
- * gcm_calibrate_argyll_get_sensor_client_image_attach:
+ * gcm_calibrate_argyll_get_sensor_image_attach:
  **/
 static const gchar *
-gcm_calibrate_argyll_get_sensor_client_image_attach (GcmCalibrateArgyll *calibrate_argyll)
+gcm_calibrate_argyll_get_sensor_image_attach (GcmCalibrateArgyll *calibrate_argyll)
 {
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 
-	g_object_get (calibrate_argyll, "sensor_client-kind", &sensor_client_kind, NULL);
-	if (sensor_client_kind == GCM_SENSOR_KIND_HUEY)
+	g_object_get (calibrate_argyll, "sensor-kind", &sensor_kind, NULL);
+	if (sensor_kind == GCM_SENSOR_KIND_HUEY)
 		return "huey-attach.svg";
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
 		return "munki-attach.svg";
-	if (sensor_client_kind == GCM_SENSOR_KIND_SPYDER)
+	if (sensor_kind == GCM_SENSOR_KIND_SPYDER)
 		return "spyder-attach.svg";
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLORIMTRE_HCFR)
+	if (sensor_kind == GCM_SENSOR_KIND_COLORIMTRE_HCFR)
 		return "hcfr-attach.svg";
-	if (sensor_client_kind == GCM_SENSOR_KIND_I1_PRO)
+	if (sensor_kind == GCM_SENSOR_KIND_I1_PRO)
 		return "i1-attach.svg";
 	return NULL;
 }
 
 /**
- * gcm_calibrate_argyll_get_sensor_client_image_calibrate:
+ * gcm_calibrate_argyll_get_sensor_image_calibrate:
  **/
 static const gchar *
-gcm_calibrate_argyll_get_sensor_client_image_calibrate (GcmCalibrateArgyll *calibrate_argyll)
+gcm_calibrate_argyll_get_sensor_image_calibrate (GcmCalibrateArgyll *calibrate_argyll)
 {
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 
-	g_object_get (calibrate_argyll, "sensor_client-kind", &sensor_client_kind, NULL);
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
+	g_object_get (calibrate_argyll, "sensor-kind", &sensor_kind, NULL);
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
 		return "munki-calibrate.svg";
 	return NULL;
 }
 
 /**
- * gcm_calibrate_argyll_get_sensor_client_image_screen:
+ * gcm_calibrate_argyll_get_sensor_image_screen:
  **/
 static const gchar *
-gcm_calibrate_argyll_get_sensor_client_image_screen (GcmCalibrateArgyll *calibrate_argyll)
+gcm_calibrate_argyll_get_sensor_image_screen (GcmCalibrateArgyll *calibrate_argyll)
 {
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 
-	g_object_get (calibrate_argyll, "sensor_client-kind", &sensor_client_kind, NULL);
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
+	g_object_get (calibrate_argyll, "sensor-kind", &sensor_kind, NULL);
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
 		return "munki-screen.svg";
 	return NULL;
 }
@@ -1553,30 +1553,30 @@ out:
 }
 
 /**
- * gcm_calibrate_argyll_get_sensor_client_target:
+ * gcm_calibrate_argyll_get_sensor_target:
  **/
 static const gchar *
-gcm_calibrate_argyll_get_sensor_client_target (GcmCalibrateArgyll *calibrate_argyll)
+gcm_calibrate_argyll_get_sensor_target (GcmCalibrateArgyll *calibrate_argyll)
 {
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 
 	g_object_get (calibrate_argyll,
-		      "sensor_client-kind", &sensor_client_kind,
+		      "sensor-kind", &sensor_kind,
 		      NULL);
 
-	if (sensor_client_kind == GCM_SENSOR_KIND_DTP20)
+	if (sensor_kind == GCM_SENSOR_KIND_DTP20)
 		return "20";
-	if (sensor_client_kind == GCM_SENSOR_KIND_DTP22)
+	if (sensor_kind == GCM_SENSOR_KIND_DTP22)
 		return "22";
-	if (sensor_client_kind == GCM_SENSOR_KIND_DTP41)
+	if (sensor_kind == GCM_SENSOR_KIND_DTP41)
 		return "41";
-	if (sensor_client_kind == GCM_SENSOR_KIND_DTP51)
+	if (sensor_kind == GCM_SENSOR_KIND_DTP51)
 		return "51";
-	if (sensor_client_kind == GCM_SENSOR_KIND_SPECTRO_SCAN)
+	if (sensor_kind == GCM_SENSOR_KIND_SPECTRO_SCAN)
 		return "SS";
-	if (sensor_client_kind == GCM_SENSOR_KIND_I1_PRO)
+	if (sensor_kind == GCM_SENSOR_KIND_I1_PRO)
 		return "i1";
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI)
 		return "CM";
 	return NULL;
 }
@@ -1595,12 +1595,12 @@ gcm_calibrate_argyll_display_generate_targets (GcmCalibrateArgyll *calibrate_arg
 	gchar *basename = NULL;
 	const gchar *title;
 	const gchar *message;
-	GcmSensorKind sensor_client_kind;
+	GcmSensorKind sensor_kind;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
 		      "basename", &basename,
-		      "sensor_client-kind", &sensor_client_kind,
+		      "sensor-kind", &sensor_kind,
 		      NULL);
 
 	/* get correct name of the command */
@@ -1631,12 +1631,12 @@ gcm_calibrate_argyll_display_generate_targets (GcmCalibrateArgyll *calibrate_arg
 	g_ptr_array_add (array, g_strdup ("-v"));
 
 	/* target instrument */
-	g_ptr_array_add (array, g_strdup_printf ("-i%s", gcm_calibrate_argyll_get_sensor_client_target (calibrate_argyll)));
+	g_ptr_array_add (array, g_strdup_printf ("-i%s", gcm_calibrate_argyll_get_sensor_target (calibrate_argyll)));
 
 #ifdef USE_DOUBLE_DENSITY
 	/* use double density */
-	if (sensor_client_kind == GCM_SENSOR_KIND_COLOR_MUNKI ||
-	    sensor_client_kind == GCM_SENSOR_KIND_SPECTRO_SCAN) {
+	if (sensor_kind == GCM_SENSOR_KIND_COLOR_MUNKI ||
+	    sensor_kind == GCM_SENSOR_KIND_SPECTRO_SCAN) {
 		g_ptr_array_add (array, g_strdup ("-h"));
 	}
 #endif
@@ -2278,7 +2278,7 @@ gcm_calibrate_argyll_interaction_attach (GcmCalibrateArgyll *calibrate_argyll)
 	title = _("Please attach instrument");
 
 	/* get the image, if we have one */
-	filename = gcm_calibrate_argyll_get_sensor_client_image_attach (calibrate_argyll);
+	filename = gcm_calibrate_argyll_get_sensor_image_attach (calibrate_argyll);
 
 	/* different messages with or without image */
 	if (filename != NULL) {
@@ -2336,7 +2336,7 @@ gcm_calibrate_argyll_interaction_calibrate (GcmCalibrateArgyll *calibrate_argyll
 	egg_debug ("blocking waiting for user input: %s", title);
 
 	/* get the image, if we have one */
-	filename = gcm_calibrate_argyll_get_sensor_client_image_calibrate (calibrate_argyll);
+	filename = gcm_calibrate_argyll_get_sensor_image_calibrate (calibrate_argyll);
 
 	if (filename != NULL) {
 		/* TRANSLATORS: this is when the user has to change a setting on the sensor, and we're showing a picture */
@@ -2391,7 +2391,7 @@ gcm_calibrate_argyll_interaction_surface (GcmCalibrateArgyll *calibrate_argyll)
 	egg_debug ("blocking waiting for user input: %s", title);
 
 	/* get the image, if we have one */
-	filename = gcm_calibrate_argyll_get_sensor_client_image_screen (calibrate_argyll);
+	filename = gcm_calibrate_argyll_get_sensor_image_screen (calibrate_argyll);
 
 	if (filename != NULL) {
 		/* TRANSLATORS: this is when the user has to change a setting on the sensor, and we're showing a picture */
@@ -2997,11 +2997,11 @@ gcm_calibrate_argyll_finalize (GObject *object)
  *
  * Return value: a new GcmCalibrateArgyll object.
  **/
-GcmCalibrateArgyll *
+GcmCalibrate *
 gcm_calibrate_argyll_new (void)
 {
 	GcmCalibrateArgyll *calibrate_argyll;
 	calibrate_argyll = g_object_new (GCM_TYPE_CALIBRATE_ARGYLL, NULL);
-	return GCM_CALIBRATE_ARGYLL (calibrate_argyll);
+	return GCM_CALIBRATE (calibrate_argyll);
 }
 
diff --git a/src/gcm-calibrate-argyll.h b/src/gcm-calibrate-argyll.h
index ed117ae..e1c84e5 100644
--- a/src/gcm-calibrate-argyll.h
+++ b/src/gcm-calibrate-argyll.h
@@ -49,7 +49,7 @@ struct _GcmCalibrateArgyllClass
 };
 
 GType		 	 gcm_calibrate_argyll_get_type			(void);
-GcmCalibrateArgyll	*gcm_calibrate_argyll_new			(void);
+GcmCalibrate		*gcm_calibrate_argyll_new			(void);
 
 G_END_DECLS
 
diff --git a/src/gcm-calibrate-manual.c b/src/gcm-calibrate-manual.c
index 204d3c0..821e7de 100644
--- a/src/gcm-calibrate-manual.c
+++ b/src/gcm-calibrate-manual.c
@@ -694,11 +694,11 @@ gcm_calibrate_manual_finalize (GObject *object)
  *
  * Return value: a new GcmCalibrateManual object.
  **/
-GcmCalibrateManual *
+GcmCalibrate *
 gcm_calibrate_manual_new (void)
 {
 	GcmCalibrateManual *calibrate;
 	calibrate = g_object_new (GCM_TYPE_CALIBRATE_MANUAL, NULL);
-	return GCM_CALIBRATE_MANUAL (calibrate);
+	return GCM_CALIBRATE (calibrate);
 }
 
diff --git a/src/gcm-calibrate-manual.h b/src/gcm-calibrate-manual.h
index e69765b..7ffe19a 100644
--- a/src/gcm-calibrate-manual.h
+++ b/src/gcm-calibrate-manual.h
@@ -58,7 +58,7 @@ struct _GcmCalibrateManualClass
 };
 
 GType			 gcm_calibrate_manual_get_type		 (void);
-GcmCalibrateManual	*gcm_calibrate_manual_new		 (void);
+GcmCalibrate		*gcm_calibrate_manual_new		 (void);
 
 G_END_DECLS
 
diff --git a/src/gcm-calibrate-native.c b/src/gcm-calibrate-native.c
index 045b2a8..eef6a5f 100644
--- a/src/gcm-calibrate-native.c
+++ b/src/gcm-calibrate-native.c
@@ -352,11 +352,11 @@ gcm_calibrate_native_finalize (GObject *object)
  *
  * Return value: a new GcmCalibrateNative object.
  **/
-GcmCalibrateNative *
+GcmCalibrate *
 gcm_calibrate_native_new (void)
 {
 	GcmCalibrateNative *calibrate_native;
 	calibrate_native = g_object_new (GCM_TYPE_CALIBRATE_NATIVE, NULL);
-	return GCM_CALIBRATE_NATIVE (calibrate_native);
+	return GCM_CALIBRATE (calibrate_native);
 }
 
diff --git a/src/gcm-calibrate-native.h b/src/gcm-calibrate-native.h
index 47ed9ea..281d295 100644
--- a/src/gcm-calibrate-native.h
+++ b/src/gcm-calibrate-native.h
@@ -49,7 +49,7 @@ struct _GcmCalibrateNativeClass
 };
 
 GType		 	 gcm_calibrate_native_get_type			(void);
-GcmCalibrateNative	*gcm_calibrate_native_new			(void);
+GcmCalibrate		*gcm_calibrate_native_new			(void);
 
 G_END_DECLS
 
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index 75601fb..8962177 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -154,7 +154,7 @@ gcm_test_calibrate_dialog_func (void)
 static void
 gcm_test_calibrate_manual_func (void)
 {
-	GcmCalibrateManual *calibrate;
+	GcmCalibrate *calibrate;
 	gboolean ret;
 	GError *error = NULL;
 
@@ -167,7 +167,7 @@ gcm_test_calibrate_manual_func (void)
 		      NULL);
 
 	/* calibrate display manually */
-	ret = gcm_calibrate_display (GCM_CALIBRATE(calibrate), NULL, &error);
+	ret = gcm_calibrate_display (calibrate, NULL, &error);
 	g_assert_no_error (error);
 	g_assert (ret);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]