From 36d20eb1b84055326459a6eaa69ad1395a240d6d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 16 Mar 2012 23:18:26 -0400 Subject: [PATCH] st-entry: Remove unused set_icon_from_file methods This lets us ditch some methods in the texture cache. https://bugzilla.gnome.org/show_bug.cgi?id=672273 --- src/st/st-entry.c | 61 ----------------------------------------------- src/st/st-entry.h | 4 ---- 2 files changed, 65 deletions(-) diff --git a/src/st/st-entry.c b/src/st/st-entry.c index 334b11441..a035cd264 100644 --- a/src/st/st-entry.c +++ b/src/st/st-entry.c @@ -901,25 +901,6 @@ _st_entry_set_icon (StEntry *entry, clutter_actor_queue_relayout (CLUTTER_ACTOR (entry)); } -static void -_st_entry_set_icon_from_file (StEntry *entry, - ClutterActor **icon, - const gchar *filename) -{ - ClutterActor *new_icon = NULL; - - if (filename) - { - StTextureCache *cache; - - cache = st_texture_cache_get_default (); - - new_icon = (ClutterActor*) st_texture_cache_load_file_simple (cache, filename); - } - - _st_entry_set_icon (entry, icon, new_icon); -} - /** * st_entry_set_primary_icon: * @entry: a #StEntry @@ -960,48 +941,6 @@ st_entry_set_secondary_icon (StEntry *entry, _st_entry_set_icon (entry, &priv->secondary_icon, icon); } -/** - * st_entry_set_primary_icon_from_file: - * @entry: a #StEntry - * @filename: (allow-none): filename of an icon - * - * Set the primary icon of the entry to the given filename - */ -void -st_entry_set_primary_icon_from_file (StEntry *entry, - const gchar *filename) -{ - StEntryPrivate *priv; - - g_return_if_fail (ST_IS_ENTRY (entry)); - - priv = entry->priv; - - _st_entry_set_icon_from_file (entry, &priv->primary_icon, filename); - -} - -/** - * st_entry_set_secondary_icon_from_file: - * @entry: a #StEntry - * @filename: (allow-none): filename of an icon - * - * Set the primary icon of the entry to the given filename - */ -void -st_entry_set_secondary_icon_from_file (StEntry *entry, - const gchar *filename) -{ - StEntryPrivate *priv; - - g_return_if_fail (ST_IS_ENTRY (entry)); - - priv = entry->priv; - - _st_entry_set_icon_from_file (entry, &priv->secondary_icon, filename); - -} - /******************************************************************************/ /*************************** ACCESSIBILITY SUPPORT ****************************/ /******************************************************************************/ diff --git a/src/st/st-entry.h b/src/st/st-entry.h index 7febbb5ec..f48dc53de 100644 --- a/src/st/st-entry.h +++ b/src/st/st-entry.h @@ -78,10 +78,6 @@ void st_entry_set_primary_icon (StEntry *entry, ClutterActor *icon); void st_entry_set_secondary_icon (StEntry *entry, ClutterActor *icon); -void st_entry_set_primary_icon_from_file (StEntry *entry, - const gchar *filename); -void st_entry_set_secondary_icon_from_file (StEntry *entry, - const gchar *filename); G_END_DECLS