diff options
| author | Richard Hughes <richard@hughsie.com> | 2014-06-10 08:59:49 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2014-10-24 09:43:45 +0100 |
| commit | 1e1ffb70ecb3bba26ca5c46bd804ab88fbec61a0 (patch) | |
| tree | 9e7508e66ab419a70d44b014de11b5f191ac23cf | |
| parent | b4055591dcbde5ed9ee8f7321502993294c6a8f0 (diff) | |
| download | colord-1e1ffb70ecb3bba26ca5c46bd804ab88fbec61a0.tar.gz | |
trivial: Fix up the ColorHug+ enum names
| -rw-r--r-- | lib/colord/cd-enum.c | 2 | ||||
| -rw-r--r-- | lib/colord/cd-enum.h | 5 | ||||
| -rw-r--r-- | src/sensors/cd-sensor-argyll.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/colord/cd-enum.c b/lib/colord/cd-enum.c index 934b87e..cd18785 100644 --- a/lib/colord/cd-enum.c +++ b/lib/colord/cd-enum.c @@ -48,7 +48,7 @@ typedef struct { static const CdEnumMatch enum_sensor_kind[] = { {CD_SENSOR_KIND_UNKNOWN, "unknown"}, /* fall though value */ {CD_SENSOR_KIND_COLORHUG, "colorhug"}, - {CD_SENSOR_KIND_COLORHUG_SPECTRO, "colorhug-spectro"}, + {CD_SENSOR_KIND_COLORHUG_PLUS, "colorhug-plus"}, {CD_SENSOR_KIND_COLORIMTRE_HCFR, "colorimtre-hcfr"}, {CD_SENSOR_KIND_COLOR_MUNKI_PHOTO, "color-munki-photo"}, {CD_SENSOR_KIND_COLOR_MUNKI_SMILE, "color-munki-smile"}, diff --git a/lib/colord/cd-enum.h b/lib/colord/cd-enum.h index c4d3b26..7b054a1 100644 --- a/lib/colord/cd-enum.h +++ b/lib/colord/cd-enum.h @@ -183,7 +183,7 @@ typedef enum { CD_SENSOR_KIND_COLORHUG, /* Since: 0.1.15 */ CD_SENSOR_KIND_SPYDER2, /* Since: 0.1.16 */ CD_SENSOR_KIND_SPYDER3, /* Since: 0.1.16 */ - CD_SENSOR_KIND_COLORHUG_SPECTRO, /* Since: 0.1.24 */ + CD_SENSOR_KIND_COLORHUG_PLUS, /* Since: 0.1.24 */ CD_SENSOR_KIND_I1_DISPLAY1, /* Since: 0.1.25 */ CD_SENSOR_KIND_I1_DISPLAY2, /* Since: 0.1.25 */ CD_SENSOR_KIND_DTP92, /* Since: 0.1.25 */ @@ -194,6 +194,9 @@ typedef enum { CD_SENSOR_KIND_LAST } CdSensorKind; +/* renamed due to trademark issue */ +#define CD_SENSOR_KIND_COLORHUG_SPECTRO CD_SENSOR_KIND_COLORHUG_PLUS + /** * CdSensorCap: * diff --git a/src/sensors/cd-sensor-argyll.c b/src/sensors/cd-sensor-argyll.c index 3dc4b1b..e83c110 100644 --- a/src/sensors/cd-sensor-argyll.c +++ b/src/sensors/cd-sensor-argyll.c @@ -371,8 +371,8 @@ cd_sensor_to_argyll_name (CdSensor *sensor) return "GretagMacbeth Huey"; case CD_SENSOR_KIND_COLORHUG: return "Hughski ColorHug"; - case CD_SENSOR_KIND_COLORHUG_SPECTRO: - return "Hughski ColorHug Spectro"; + case CD_SENSOR_KIND_COLORHUG_PLUS: + return "Hughski ColorHug+"; default: break; } |