GNOME.org
 

[gnome-color-manager] To avoid any legal problems in the future, do not call scanners by name, and instead use generic lan

commit 03a2c306f82655404b977216a55cf2c521dd245b
Author: Richard Hughes <richard hughsie com>
Date:   Fri Nov 27 11:18:36 2009 +0000

    To avoid any legal problems in the future, do not call scanners by name, and instead use generic language

 src/gcm-calibrate.c |   48 ++++++++++++++++++++++++------------------------
 src/gcm-calibrate.h |   10 +++++-----
 src/gcm-prefs.c     |   26 +++++++++++++-------------
 3 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index c06e2b9..5b4491e 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -713,10 +713,10 @@ out:
 }
 
 /**
- * gcm_calibrate_scanner_setup:
+ * gcm_calibrate_device_setup:
  **/
 static gboolean
-gcm_calibrate_scanner_setup (GcmCalibrate *calibrate, GError **error)
+gcm_calibrate_device_setup (GcmCalibrate *calibrate, GError **error)
 {
 	gboolean ret = TRUE;
 	GString *string = NULL;
@@ -725,16 +725,16 @@ gcm_calibrate_scanner_setup (GcmCalibrate *calibrate, GError **error)
 	string = g_string_new ("");
 
 	/* TRANSLATORS: title, a profile is a ICC file */
-	gcm_calibrate_set_title (calibrate, _("Setting up scanner"));
+	gcm_calibrate_set_title (calibrate, _("Setting up device"));
 
 	/* TRANSLATORS: dialog message, preface */
-	g_string_append_printf (string, "%s\n", _("Before calibrating the scanner, you have to manually scan a reference image and save it as a TIFF image file."));
+	g_string_append_printf (string, "%s\n", _("Before calibrating the device, you have to manually acquire a reference image and save it as a TIFF image file."));
 
 	/* TRANSLATORS: dialog message, preface */
 	g_string_append_printf (string, "%s\n", _("Ensure that the contrast and brightness is not changed and color correction profiles are not applied."));
 
 	/* TRANSLATORS: dialog message, suffix */
-	g_string_append_printf (string, "%s\n", _("The scanner glass should have been cleaned prior to scanning and the output file resolution should be at least 200dpi."));
+	g_string_append_printf (string, "%s\n", _("The device sensor should have been cleaned prior to scanning and the output file resolution should be at least 200dpi."));
 
 	/* TRANSLATORS: dialog message, suffix */
 	g_string_append_printf (string, "\n%s\n", _("For best results, the reference image should also be less than two years old."));
@@ -762,13 +762,13 @@ out:
 }
 
 /**
- * gcm_calibrate_scanner_copy:
+ * gcm_calibrate_device_copy:
  **/
 static gboolean
-gcm_calibrate_scanner_copy (GcmCalibrate *calibrate, GError **error)
+gcm_calibrate_device_copy (GcmCalibrate *calibrate, GError **error)
 {
 	gboolean ret;
-	gchar *scanner = NULL;
+	gchar *device = NULL;
 	gchar *it8cht = NULL;
 	gchar *it8ref = NULL;
 	gchar *filename = NULL;
@@ -783,7 +783,7 @@ gcm_calibrate_scanner_copy (GcmCalibrate *calibrate, GError **error)
 
 	/* build filenames */
 	filename = g_strdup_printf ("%s.tif", priv->basename);
-	scanner = g_build_filename (GCM_CALIBRATE_TEMP_DIR, filename, NULL);
+	device = g_build_filename (GCM_CALIBRATE_TEMP_DIR, filename, NULL);
 	it8cht = g_build_filename (GCM_CALIBRATE_TEMP_DIR, "it8.cht", NULL);
 	it8ref = g_build_filename (GCM_CALIBRATE_TEMP_DIR, "it8ref.txt", NULL);
 
@@ -791,7 +791,7 @@ gcm_calibrate_scanner_copy (GcmCalibrate *calibrate, GError **error)
 	ret = gcm_utils_mkdir_and_copy ("/usr/share/color/argyll/ref/it8.cht", it8cht, error);
 	if (!ret)
 		goto out;
-	ret = gcm_utils_mkdir_and_copy (priv->filename_source, scanner, error);
+	ret = gcm_utils_mkdir_and_copy (priv->filename_source, device, error);
 	if (!ret)
 		goto out;
 	ret = gcm_utils_mkdir_and_copy (priv->filename_reference, it8ref, error);
@@ -799,17 +799,17 @@ gcm_calibrate_scanner_copy (GcmCalibrate *calibrate, GError **error)
 		goto out;
 out:
 	g_free (filename);
-	g_free (scanner);
+	g_free (device);
 	g_free (it8cht);
 	g_free (it8ref);
 	return ret;
 }
 
 /**
- * gcm_calibrate_scanner_measure:
+ * gcm_calibrate_device_measure:
  **/
 static gboolean
-gcm_calibrate_scanner_measure (GcmCalibrate *calibrate, GError **error)
+gcm_calibrate_device_measure (GcmCalibrate *calibrate, GError **error)
 {
 	gboolean ret = TRUE;
 	GcmCalibratePrivate *priv = calibrate->priv;
@@ -872,10 +872,10 @@ out:
 }
 
 /**
- * gcm_calibrate_scanner_generate_profile:
+ * gcm_calibrate_device_generate_profile:
  **/
 static gboolean
-gcm_calibrate_scanner_generate_profile (GcmCalibrate *calibrate, GError **error)
+gcm_calibrate_device_generate_profile (GcmCalibrate *calibrate, GError **error)
 {
 	gboolean ret = TRUE;
 	GcmCalibratePrivate *priv = calibrate->priv;
@@ -931,7 +931,7 @@ gcm_calibrate_scanner_generate_profile (GcmCalibrate *calibrate, GError **error)
 	/* TRANSLATORS: title, a profile is a ICC file */
 	gcm_calibrate_set_title (calibrate, _("Generating the profile"));
 	/* TRANSLATORS: dialog message */
-	gcm_calibrate_set_message (calibrate, _("Generating the ICC color profile that can be used with this scanner."));
+	gcm_calibrate_set_message (calibrate, _("Generating the ICC color profile that can be used with this device."));
 
 	/* wait until finished */
 	g_main_loop_run (priv->loop);
@@ -992,20 +992,20 @@ gcm_calibrate_task (GcmCalibrate *calibrate, GcmCalibrateTask task, GError **err
 		ret = gcm_calibrate_display_generate_profile (calibrate, error);
 		goto out;
 	}
-	if (task == GCM_CALIBRATE_TASK_SCANNER_SETUP) {
-		ret = gcm_calibrate_scanner_setup (calibrate, error);
+	if (task == GCM_CALIBRATE_TASK_DEVICE_SETUP) {
+		ret = gcm_calibrate_device_setup (calibrate, error);
 		goto out;
 	}
-	if (task == GCM_CALIBRATE_TASK_SCANNER_COPY) {
-		ret = gcm_calibrate_scanner_copy (calibrate, error);
+	if (task == GCM_CALIBRATE_TASK_DEVICE_COPY) {
+		ret = gcm_calibrate_device_copy (calibrate, error);
 		goto out;
 	}
-	if (task == GCM_CALIBRATE_TASK_SCANNER_MEASURE) {
-		ret = gcm_calibrate_scanner_measure (calibrate, error);
+	if (task == GCM_CALIBRATE_TASK_DEVICE_MEASURE) {
+		ret = gcm_calibrate_device_measure (calibrate, error);
 		goto out;
 	}
-	if (task == GCM_CALIBRATE_TASK_SCANNER_GENERATE_PROFILE) {
-		ret = gcm_calibrate_scanner_generate_profile (calibrate, error);
+	if (task == GCM_CALIBRATE_TASK_DEVICE_GENERATE_PROFILE) {
+		ret = gcm_calibrate_device_generate_profile (calibrate, error);
 		goto out;
 	}
 out:
diff --git a/src/gcm-calibrate.h b/src/gcm-calibrate.h
index d24157d..e6399d1 100644
--- a/src/gcm-calibrate.h
+++ b/src/gcm-calibrate.h
@@ -60,11 +60,11 @@ typedef enum {
 	GCM_CALIBRATE_TASK_DISPLAY_GENERATE_PATCHES,
 	GCM_CALIBRATE_TASK_DISPLAY_DRAW_AND_MEASURE,
 	GCM_CALIBRATE_TASK_DISPLAY_GENERATE_PROFILE,
-	GCM_CALIBRATE_TASK_SCANNER_SETUP,
-	GCM_CALIBRATE_TASK_SCANNER_COPY,
-	GCM_CALIBRATE_TASK_SCANNER_MEASURE,
-	GCM_CALIBRATE_TASK_SCANNER_GENERATE_PROFILE,
-	GCM_CALIBRATE_TASK_DISPLAY_UNKNOWN,
+	GCM_CALIBRATE_TASK_DEVICE_SETUP,
+	GCM_CALIBRATE_TASK_DEVICE_COPY,
+	GCM_CALIBRATE_TASK_DEVICE_MEASURE,
+	GCM_CALIBRATE_TASK_DEVICE_GENERATE_PROFILE,
+	GCM_CALIBRATE_TASK_UNKNOWN,
 } GcmCalibrateTask;
 
 GType		 gcm_calibrate_get_type		  	(void);
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index f441ddb..9f7fadd 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -241,10 +241,10 @@ out:
 }
 
 /**
- * gcm_prefs_calibrate_scanner_get_scanned_profile:
+ * gcm_prefs_calibrate_device_get_scanned_profile:
  **/
 static gchar *
-gcm_prefs_calibrate_scanner_get_scanned_profile (void)
+gcm_prefs_calibrate_device_get_scanned_profile (void)
 {
 	gchar *filename = NULL;
 	GtkWindow *window;
@@ -284,10 +284,10 @@ gcm_prefs_calibrate_scanner_get_scanned_profile (void)
 }
 
 /**
- * gcm_prefs_calibrate_scanner_get_reference_data:
+ * gcm_prefs_calibrate_device_get_reference_data:
  **/
 static gchar *
-gcm_prefs_calibrate_scanner_get_reference_data (void)
+gcm_prefs_calibrate_device_get_reference_data (void)
 {
 	gchar *filename = NULL;
 	GtkWindow *window;
@@ -327,10 +327,10 @@ gcm_prefs_calibrate_scanner_get_reference_data (void)
 }
 
 /**
- * gcm_prefs_calibrate_scanner:
+ * gcm_prefs_calibrate_device:
  **/
 static gboolean
-gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
+gcm_prefs_calibrate_device (GcmCalibrate *calib)
 {
 	gboolean ret = FALSE;
 	GError *error = NULL;
@@ -354,7 +354,7 @@ gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
 	}
 
 	/* step 0 */
-	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_SCANNER_SETUP, &error);
+	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_DEVICE_SETUP, &error);
 	if (!ret) {
 		egg_warning ("failed to setup: %s", error->message);
 		g_error_free (error);
@@ -362,12 +362,12 @@ gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
 	}
 
 	/* get scanned image */
-	scanned_image = gcm_prefs_calibrate_scanner_get_scanned_profile ();
+	scanned_image = gcm_prefs_calibrate_device_get_scanned_profile ();
 	if (scanned_image == NULL)
 		goto out;
 
 	/* get reference data */
-	reference_data = gcm_prefs_calibrate_scanner_get_reference_data ();
+	reference_data = gcm_prefs_calibrate_device_get_reference_data ();
 	if (reference_data == NULL)
 		goto out;
 
@@ -392,7 +392,7 @@ gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
 		      NULL);
 
 	/* step 1 */
-	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_SCANNER_COPY, &error);
+	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_DEVICE_COPY, &error);
 	if (!ret) {
 		egg_warning ("failed to calibrate: %s", error->message);
 		g_error_free (error);
@@ -400,7 +400,7 @@ gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
 	}
 
 	/* step 2 */
-	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_SCANNER_MEASURE, &error);
+	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_DEVICE_MEASURE, &error);
 	if (!ret) {
 		egg_warning ("failed to calibrate: %s", error->message);
 		g_error_free (error);
@@ -408,7 +408,7 @@ gcm_prefs_calibrate_scanner (GcmCalibrate *calib)
 	}
 
 	/* step 3 */
-	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_SCANNER_GENERATE_PROFILE, &error);
+	ret = gcm_calibrate_task (calib, GCM_CALIBRATE_TASK_DEVICE_GENERATE_PROFILE, &error);
 	if (!ret) {
 		egg_warning ("failed to calibrate: %s", error->message);
 		g_error_free (error);
@@ -466,7 +466,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, gpointer data)
 		break;
 	case GCM_DEVICE_TYPE_SCANNER:
 	case GCM_DEVICE_TYPE_CAMERA:
-		gcm_prefs_calibrate_scanner (calib);
+		gcm_prefs_calibrate_device (calib);
 		break;
 	default:
 		egg_warning ("calibration not supported for this device");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]