From 09314551f4d36a6f92c44546929ffb499d4bff87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damien=20Th=C3=A9bault?= Date: Wed, 16 Feb 2022 22:28:57 +0100 Subject: Show device model even if vendor is not available --- src/gpm-statistics.c | 3 +++ src/gpm-tray-icon.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c index 0f6ad66..0b7b9fc 100644 --- a/src/gpm-statistics.c +++ b/src/gpm-statistics.c @@ -920,6 +920,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)); } diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c index 6ace66c..9f5fe38 100644 --- a/src/gpm-tray-icon.c +++ b/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); } -- cgit v1.2.1