From 34add0cfe258341611c04e949c55698b6ff990ae Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 1 Jun 2010 14:25:10 +0100 Subject: [PATCH] Add UP_DEVICE_KIND_COMPUTER as we'll need UP_DEVICE_KIND_TABLET for wacom tablets --- libupower-glib/up-types.c | 3 +++ libupower-glib/up-types.h | 1 + src/linux/up-device-idevice.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libupower-glib/up-types.c b/libupower-glib/up-types.c index fb07cd9..9109c54 100644 --- a/libupower-glib/up-types.c +++ b/libupower-glib/up-types.c @@ -79,6 +79,9 @@ up_device_kind_to_string (UpDeviceKind type_enum) case UP_DEVICE_KIND_TABLET: type = "tablet"; break; + case UP_DEVICE_KIND_COMPUTER: + type = "computer"; + break; default: type = "unknown"; break; diff --git a/libupower-glib/up-types.h b/libupower-glib/up-types.h index 8186ce6..4e1d285 100644 --- a/libupower-glib/up-types.h +++ b/libupower-glib/up-types.h @@ -47,6 +47,7 @@ typedef enum { UP_DEVICE_KIND_PHONE, UP_DEVICE_KIND_MEDIA_PLAYER, UP_DEVICE_KIND_TABLET, + UP_DEVICE_KIND_COMPUTER, UP_DEVICE_KIND_LAST } UpDeviceKind; diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c index 8b3e701..cd5d28b 100644 --- a/src/linux/up-device-idevice.c +++ b/src/linux/up-device-idevice.c @@ -126,7 +126,7 @@ up_device_idevice_coldplug (UpDevice *device) model = g_udev_device_get_property (native, "ID_MODEL"); kind = UP_DEVICE_KIND_PHONE; if (model != NULL && g_strstr_len (model, -1, "iPad")) { - kind = UP_DEVICE_KIND_TABLET; + kind = UP_DEVICE_KIND_COMPUTER; } else if (model != NULL && g_strstr_len (model, -1, "iPod")) { kind = UP_DEVICE_KIND_MEDIA_PLAYER; }