[gnome-settings-daemon] wacom: Add support for the puck device type

[Bastien Nocera <hadess src gnome org>]

commit f6eba519c2e47e8bdc5ac9df3ffb0893f3d59a9a
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 31 14:10:14 2012 +0000

    wacom: Add support for the puck device type

 plugins/wacom/gsd-wacom-device.c |    2 ++
 plugins/wacom/gsd-wacom-device.h |    3 ++-
 plugins/wacom/list-wacom.c       |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c
index fce3ce5..5c7edd1 100644
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -221,6 +221,8 @@ gsd_wacom_stylus_get_stylus_type (GsdWacomStylus *stylus)
 		return WACOM_STYLUS_TYPE_MARKER;
 	case WSTYLUS_STROKE:
 		return WACOM_STYLUS_TYPE_STROKE;
+	case WSTYLUS_PUCK:
+		return WACOM_STYLUS_TYPE_PUCK;
 	default:
 		g_assert_not_reached ();
 	}
diff --git a/plugins/wacom/gsd-wacom-device.h b/plugins/wacom/gsd-wacom-device.h
index 8d5ad06..d1b3b7d 100644
--- a/plugins/wacom/gsd-wacom-device.h
+++ b/plugins/wacom/gsd-wacom-device.h
@@ -73,7 +73,8 @@ typedef enum {
 	WACOM_STYLUS_TYPE_AIRBRUSH,
 	WACOM_STYLUS_TYPE_CLASSIC,
 	WACOM_STYLUS_TYPE_MARKER,
-	WACOM_STYLUS_TYPE_STROKE
+	WACOM_STYLUS_TYPE_STROKE,
+	WACOM_STYLUS_TYPE_PUCK
 } GsdWacomStylusType;
 
 #define NUM_ELEMS_MATRIX 9
diff --git a/plugins/wacom/list-wacom.c b/plugins/wacom/list-wacom.c
index 5920674..6f3b2b0 100644
--- a/plugins/wacom/list-wacom.c
+++ b/plugins/wacom/list-wacom.c
@@ -65,6 +65,8 @@ stylus_type_to_string (GsdWacomStylusType type)
 		return "Marker";
 	case WACOM_STYLUS_TYPE_STROKE:
 		return "Stroke";
+	case WACOM_STYLUS_TYPE_PUCK:
+		return "Puck";
 	default:
 		g_assert_not_reached ();
 	}