From d5aa2f3252786246cbdd0ef2797e5c5dab4aa800 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 27 Mar 2024 13:53:01 -0700 Subject: [PATCH] status-area: Handle clients that don't provide `icon_name`/`icon_pixmap` It seems some clients expose the properties and leave them empty, but others just provide either one on its own. This fixes clients like Mattermost. --- .../src/subscriptions/status_notifier_item.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs b/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs index 6316d6ab..2aaa7358 100644 --- a/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs +++ b/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs @@ -33,10 +33,11 @@ impl StatusNotifierItem { .build() .await?; - let icon_name = item_proxy.icon_name().await?; + let icon_name = item_proxy.icon_name().await.unwrap_or_default(); let icon_pixmap = item_proxy .icon_pixmap() - .await? + .await + .unwrap_or_default() .into_iter() .max_by_key(|i| (i.width, i.height)) .map(|mut i| {