[gtk: 9/31] icontheme: Handle GEmblemIcon in lookup_by_gicon()
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 9/31] icontheme: Handle GEmblemIcon in lookup_by_gicon()
- Date: Mon, 10 Feb 2020 12:47:32 +0000 (UTC)
commit a0533923fb224d54a723eaa43bd64229f169176e
Author: Alexander Larsson <alexl redhat com>
Date: Thu Feb 6 10:26:26 2020 +0100
icontheme: Handle GEmblemIcon in lookup_by_gicon()
gtk/gtkicontheme.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 4911c71eb2..639c881cdc 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3557,6 +3557,10 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme *self,
g_return_val_if_fail (GTK_IS_ICON_THEME (self), NULL);
g_return_val_if_fail (G_IS_ICON (gicon), NULL);
+ /* We can't render emblemed icons atm, but at least render the base */
+ while (G_IS_EMBLEMED_ICON (gicon))
+ gicon = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (gicon));
+
if (GDK_IS_PIXBUF (gicon))
{
GdkPixbuf *pixbuf = GDK_PIXBUF (gicon);
@@ -3584,7 +3588,7 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme *self,
}
else
{
- g_debug ("Unhandled GIcon type %s", g_type_name_from_instance (gicon));
+ g_debug ("Unhandled GIcon type %s", g_type_name_from_instance ((GTypeInstance *)gicon));
icon = icon_paintable_new (size, scale);
icon->filename = g_strdup (IMAGE_MISSING_RESOURCE_PATH);
icon->is_resource = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]