Merge tag 'upstream/0.5.1+git20170605'

Upstream version 0.5.1+git20170605

1 files changed, 0 insertions, 102 deletions

diff --git a/iconcache.c b/iconcache.c
deleted file mode 100644
index c927ca5e..00000000
--- a/iconcache.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#include <iconcache.h>
-#include <config.h>
-#include <hardinfo.h>
-
-static GHashTable *cache = NULL;
-
-void icon_cache_init(void)
-{
-    DEBUG("initializing icon cache");
-    if (!cache) {
-	cache = g_hash_table_new(g_str_hash, g_str_equal);
-    } else {
-        DEBUG("already initialized? huh?");
-    }
-}
-
-GdkPixbuf *icon_cache_get_pixbuf(const gchar * file)
-{
-    GdkPixbuf *icon;
-
-    if (!cache)
-	icon_cache_init();
-
-    icon = g_hash_table_lookup(cache, file);
-
-    if (!icon) {
-	gchar *path;
-
-	path = g_build_filename(params.path_data, "pixmaps", file, NULL);
-	icon = gdk_pixbuf_new_from_file(path, NULL);
-	g_hash_table_insert(cache, g_strdup(file), icon);
-
-	g_free(path);
-    }
-
-    if (icon) {
-      g_object_ref(icon);
-    }
-
-    return icon;
-}
-
-GtkWidget *icon_cache_get_image(const gchar * file)
-{
-    GdkPixbuf *icon;
-
-    icon = icon_cache_get_pixbuf(file);
-    return gtk_image_new_from_pixbuf(icon);
-}
-
-GdkPixbuf *icon_cache_get_pixbuf_at_size(const gchar * file, gint wid,
-					 gint hei)
-{
-    GdkPixbuf *icon;
-
-    if (!cache)
-	icon_cache_init();
-
-    icon = g_hash_table_lookup(cache, file);
-
-    if (!icon) {
-	gchar *path;
-
-	path = g_build_filename(params.path_data, "pixmaps", file, NULL);
-	icon = gdk_pixbuf_new_from_file_at_size(path, wid, hei, NULL);
-	g_hash_table_insert(cache, g_strdup(file), icon);
-
-	g_free(path);
-    }
-
-    if (icon) {
-      g_object_ref(icon);
-    }
-
-    return icon;
-}
-
-GtkWidget *icon_cache_get_image_at_size(const gchar * file, gint wid,
-					gint hei)
-{
-    GdkPixbuf *icon;
-
-    icon = icon_cache_get_pixbuf_at_size(file, wid, hei);
-    return gtk_image_new_from_pixbuf(icon);
-}