From 5b4553ff0cccd96f4b543005e26d419a1a62e432 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 2 Oct 2012 21:40:14 -0300 Subject: [PATCH] Revert "st-texture-cache: Remove load_icon_name" This reverts commit 8b6df2e23f3be3d6ce0d99f7bc4ab35baed4f7c4. I shouldn't be going around removing API in minor releases. Sorry about that. --- src/st/st-texture-cache.c | 35 +++++++++++++++++++++++++++++++++++ src/st/st-texture-cache.h | 5 +++++ 2 files changed, 40 insertions(+) diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index 0508006fd..211143254 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -1161,6 +1161,41 @@ st_texture_cache_load_sliced_image (StTextureCache *cache, return actor; } +/** + * st_texture_cache_load_icon_name: + * @cache: The texture cache instance + * @theme_node: (allow-none): a #StThemeNode + * @name: Name of a themed icon + * @size: Size of themed icon + * + * Load a themed icon into a texture. The colors used for symbolic + * icons are derived from @theme_node. + * + * Return Value: (transfer none): A new #ClutterTexture for the icon + */ +ClutterActor * +st_texture_cache_load_icon_name (StTextureCache *cache, + StThemeNode *theme_node, + const char *name, + gint size) +{ + ClutterActor *texture; + GIcon *themed; + + themed = g_themed_icon_new_with_default_fallbacks (name); + texture = load_gicon_with_colors (cache, themed, size, + theme_node ? st_theme_node_get_icon_colors (theme_node) : NULL); + g_object_unref (themed); + + if (texture == NULL) + { + texture = (ClutterActor *) create_default_texture (); + clutter_actor_set_size (texture, size, size); + } + + return texture; +} + /** * st_texture_cache_load_uri_async: * @cache: The texture cache instance diff --git a/src/st/st-texture-cache.h b/src/st/st-texture-cache.h index ce9857dae..b5c563b84 100644 --- a/src/st/st-texture-cache.h +++ b/src/st/st-texture-cache.h @@ -81,6 +81,11 @@ ClutterActor *st_texture_cache_bind_pixbuf_property (StTextureCache *cache, GObject *object, const char *property_name); +ClutterActor *st_texture_cache_load_icon_name (StTextureCache *cache, + StThemeNode *theme_node, + const char *name, + gint size); + ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache, StThemeNode *theme_node, GIcon *icon,