callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop the builtin icon cache

Browse Source 
We don't need it anymore, now that the non-standard stock icons
are using resources.
This commit is contained in:
Matthias Clasen
2014-06-17 22:06:08 -04:00
parent ea8afd2937
commit 36be12578c
85 changed files with 6 additions and 17365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/deprecated/gtkiconfactory.c
View File

@ -1454,8 +1454,6 @@ find_and_render_icon_source (GtkIconSet *icon_set,
return pixbuf;
}
extern GtkIconCache *_builtin_cache;
static GdkPixbuf*
render_fallback_image (GtkStyleContext *context,
GtkTextDirection direction,
@ -1467,21 +1465,12 @@ render_fallback_image (GtkStyleContext *context,
if (fallback_source.type == GTK_ICON_SOURCE_EMPTY)
{
gint index;
GdkPixbuf *pixbuf;
_gtk_icon_theme_ensure_builtin_cache ();
index = _gtk_icon_cache_get_directory_index (_builtin_cache, "24");
pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, "image-missing", index);
g_return_val_if_fail(pixbuf != NULL, NULL);
gtk_icon_source_set_pixbuf (&fallback_source, pixbuf);
g_object_unref (pixbuf);
fallback_source.type = GTK_ICON_SOURCE_STATIC_ICON_NAME;
fallback_source.source.icon_name = (gchar *)"image-missing";
fallback_source.direction = GTK_TEXT_DIR_NONE;
}
return gtk_render_icon_pixbuf (context, &fallback_source, size);
return render_icon_name_pixbuf (&fallback_source, context, size, 1);
}
static GdkPixbuf*