Skip to content

Commit

Permalink
notifications: Fix icon fallback when DesktopAppInfo is null
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
  • Loading branch information
EbonJaeger committed Oct 16, 2023
1 parent b4fb60d commit 1eb013c
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/lib/notification.vala
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,13 @@

private Gtk.Image? get_appinfo_image(Gtk.IconSize size, string? fallback) {
if (app_info == null) {
var fallback_image = new Gtk.Image.from_icon_name(fallback, size);
var invalid_image = (fallback_image == null) || (fallback_image.icon_name == null) || (fallback_image.icon_name == "image-missing") || (fallback_image.icon_name == "");
return invalid_image ? null : fallback_image;
var theme = Gtk.IconTheme.get_default();

if (!theme.has_icon(fallback)) {
return null;
}

return new Gtk.Image.from_icon_name(fallback, size);
}

var app_icon_name = app_info.get_string("Icon"); // Use the Icon from the respective DesktopAppInfo or fallback to generic applications-internet
Expand Down

0 comments on commit 1eb013c

Please sign in to comment.