Add support for gaming inputs (v2)

src/gpm-statistics.c

@@ -894,6 +894,9 @@ gpm_stats_add_device (UpDevice *device, GPtrArray *devices)
 	if ((vendor != NULL && strlen(vendor) != 0) && (model != NULL && strlen(model) != 0)) {
 		label = g_strdup_printf ("%s %s", vendor, model);
 	}
+	else if((vendor == NULL || strlen(vendor) == 0) && (model != NULL && strlen(model) != 0)) {
+		label = g_strdup_printf ("%s", model);
+	}
 	else {
 		label = g_strdup_printf ("%s", gpm_device_kind_to_localised_string (kind, 1));
 	}

src/gpm-tray-icon.c

@@ -269,6 +269,9 @@ gpm_tray_icon_add_device (GpmTrayIcon *icon, GtkMenu *menu, const GPtrArray *arr
 		if ((vendor != NULL && strlen(vendor) != 0) && (model != NULL && strlen(model) != 0)) {
 			label = g_strdup_printf ("%s %s (%.1f%%)", vendor, model, percentage);
 		}
+		else if((vendor == NULL || strlen(vendor) == 0) && (model != NULL && strlen(model) != 0)) {
+			label = g_strdup_printf ("%s (%.1f%%)", model, percentage);
+		}
 		else {
 			label = g_strdup_printf ("%s (%.1f%%)", gpm_device_kind_to_localised_string (kind, 1), percentage);
 		}
@@ -354,6 +357,7 @@ gpm_tray_icon_create_menu (GpmTrayIcon *icon)
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_MEDIA_PLAYER);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_TABLET);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_COMPUTER);
+	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_GAMING_INPUT);
 	g_ptr_array_unref (array);
 
 	/* skip for things like live-cd's and GDM */

src/gpm-upower.c

@@ -162,6 +162,9 @@ gpm_upower_get_device_icon (UpDevice *device)
 			index_str = gpm_upower_get_device_icon_index (device);
 			filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 		}
+	} else if (kind == UP_DEVICE_KIND_GAMING_INPUT) {
+		index_str = gpm_upower_get_device_icon_index (device);
+		filename = g_strdup_printf ("gpm-%s-%s", prefix, index_str);
 	}
 
 	/* nothing matched */
@@ -526,6 +529,10 @@ gpm_device_kind_to_localised_string (UpDeviceKind kind, guint number)
 		/* TRANSLATORS: tablet device */
 		text = ngettext ("Computer", "Computers", number);
 		break;
+	case UP_DEVICE_KIND_GAMING_INPUT:
+		/* TRANSLATORS: wireless gamepad, joystick etc */
+		text = ngettext ("Gaming input", "Gaming inputs", number);
+		break;
 	default:
 		g_warning ("enum unrecognised: %i", kind);
 		text = up_device_kind_to_string (kind);