isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "texture-cache: Use image-missing image when no other icon was loaded"

Browse Source 
The commit broke StIcon's :fallback-gicon property, as it relies on failure to load
an icon to determine that the fallback should be shown.

Luckily StIcon is the only user of st_texture_cache_load_gicon() (at least in
regular shell code), so we'll be able to implement the 'image-missing' fallback
there.

This reverts commit 3dd8ffc2bb.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1127
This commit is contained in:
Florian Müllner 2020-03-25 16:40:47 +01:00 committed by Georges Basile Stavracas Neto
parent 512862f2d7
commit fecc0c06ac
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/st/st-texture-cache.c
View File

@ -34,8 +34,6 @@
#define CACHE_PREFIX_FILE "file:" #define CACHE_PREFIX_FILE "file:"
#define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:" #define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"
#define IMAGE_MISSING_ICON_NAME "image-missing"
struct _StTextureCachePrivate struct _StTextureCachePrivate
{ {
GtkIconTheme *icon_theme; GtkIconTheme *icon_theme;
@ -995,16 +993,8 @@ st_texture_cache_load_gicon (StTextureCache *cache,
info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon,
size, scale, size, scale,
lookup_flags); lookup_flags);
if (info == NULL)
{
/* Do not give up without even trying to pick the image-missing fallback icon. */
info = gtk_icon_theme_lookup_icon_for_scale (theme,
IMAGE_MISSING_ICON_NAME,
size, scale,
GTK_ICON_LOOKUP_USE_BUILTIN);
if (info == NULL) if (info == NULL)
return NULL; return NULL;
}
gicon_string = g_icon_to_string (icon); gicon_string = g_icon_to_string (icon);
/* A return value of NULL indicates that the icon can not be serialized, /* A return value of NULL indicates that the icon can not be serialized,