Attachment 655242 Details for Bug 881931 – Adds def for spyder4 and correctly return string rep of enum

[patch] Adds def for spyder4 and correctly return string rep of enum

0002-add-spyder4-defs-to-the-source.patch (text/plain), 1.90 KB, created by John (J5) Palmieri on 2012-11-30 20:35:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John (J5) Palmieri

Created: 2012-11-30 20:35:37 UTC

Size: 1.90 KB

patch

obsolete

>From 60c0651c346cd18f941ba755cc4f647ad812bc1c Mon Sep 17 00:00:00 2001
>From: "John (J5) Palmieri" <john@stackdriver.com>
>Date: Thu, 29 Nov 2012 15:01:20 -0500
>Subject: [PATCH 2/2] add spyder4 defs to the source
>
>---
> libcolord/cd-enum.c | 8 ++++++++
> libcolord/cd-enum.h | 1 +
> 2 files changed, 9 insertions(+)
>
>diff --git a/libcolord/cd-enum.c b/libcolord/cd-enum.c
>index c161bb2..4068a48 100644
>--- a/libcolord/cd-enum.c
>+++ b/libcolord/cd-enum.c
>@@ -345,6 +345,8 @@ cd_sensor_kind_to_string (CdSensorKind sensor_kind)
> 		return "spyder2";
> 	if (sensor_kind == CD_SENSOR_KIND_SPYDER3)
> 		return "spyder3";
>+	if (sensor_kind == CD_SENSOR_KIND_SPYDER4)
>+		return "spyder4";
> 	if (sensor_kind == CD_SENSOR_KIND_DTP20)
> 		return "dtp20";
> 	if (sensor_kind == CD_SENSOR_KIND_DTP22)
>@@ -397,6 +399,12 @@ cd_sensor_kind_from_string (const gchar *sensor_kind)
> 		return CD_SENSOR_KIND_COLOR_MUNKI;
> 	if (g_strcmp0 (sensor_kind, "spyder") == 0)
> 		return CD_SENSOR_KIND_SPYDER;
>+        if (g_strcmp0 (sensor_kind, "spyder2") == 0)
>+                return CD_SENSOR_KIND_SPYDER2;
>+        if (g_strcmp0 (sensor_kind, "spyder3") == 0)
>+                return CD_SENSOR_KIND_SPYDER3;
>+        if (g_strcmp0 (sensor_kind, "spyder4") == 0)
>+                return CD_SENSOR_KIND_SPYDER4;
> 	if (g_strcmp0 (sensor_kind, "dtp20") == 0)
> 		return CD_SENSOR_KIND_DTP20;
> 	if (g_strcmp0 (sensor_kind, "dtp22") == 0)
>diff --git a/libcolord/cd-enum.h b/libcolord/cd-enum.h
>index cd86d1e..e8c38e1 100644
>--- a/libcolord/cd-enum.h
>+++ b/libcolord/cd-enum.h
>@@ -156,6 +156,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_SPYDER4,         /* Since: 0.1.26 */
> 	CD_SENSOR_KIND_COLORHUG_SPECTRO,/* Since: 0.1.24 */
> 	CD_SENSOR_KIND_I1_DISPLAY1,	/* Since: 0.1.25 */
> 	CD_SENSOR_KIND_I1_DISPLAY2,	/* Since: 0.1.25 */
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 881931: 654511 | 654518 | 655242