diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2007-09-11 14:53:15 -0300 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:43 -0500 |
| commit | 99a9c2a16af89bceed1f90c58faefd555a3268c3 (patch) | |
| tree | 1e92d5f8160b4445b2459044400120e430f1fc23 /iconcache.c | |
| parent | 0afab9fd83ec42e082ffa61f037519f3e1262e39 (diff) | |
| parent | 7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 (diff) | |
Import Debian changes 0.4.2.2-1
hardinfo (0.4.2.2-1) unstable; urgency=low
* New upstream release.
* hardinfo now suggests mesa-utils (Closes: #435793)
Diffstat (limited to 'iconcache.c')
| -rw-r--r-- | iconcache.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/iconcache.c b/iconcache.c index fbd0dd84..49325e39 100644 --- a/iconcache.c +++ b/iconcache.c @@ -39,12 +39,13 @@ GdkPixbuf *icon_cache_get_pixbuf(const gchar * file) icon = g_hash_table_lookup(cache, file); if (!icon) { - icon = - gdk_pixbuf_new_from_file(idle_free - (g_build_filename - (params.path_data, "pixmaps", file, - NULL)), NULL); + 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); } g_object_ref(icon); @@ -71,13 +72,13 @@ GdkPixbuf *icon_cache_get_pixbuf_at_size(const gchar * file, gint wid, icon = g_hash_table_lookup(cache, file); if (!icon) { - icon = - gdk_pixbuf_new_from_file_at_size(idle_free - (g_build_filename - (params.path_data, "pixmaps", - file, NULL)), wid, hei, - NULL); + 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); } g_object_ref(icon); |