aboutsummaryrefslogtreecommitdiff
path: root/iconcache.c
diff options
context:
space:
mode:
authorAgney Lopes Roth Ferraz <agney@debian.org>2007-12-09 05:03:40 -0400
committerSimon Quigley <tsimonq2@ubuntu.com>2017-06-19 14:38:45 -0500
commit18e8f4ab62003cb2e251f1540d083114ad489123 (patch)
tree1685ab16402d10233f81c67aa4ad7cf857246d86 /iconcache.c
parent401ee3a8ee846998cf0fa3ebadcc81cffe1da3ed (diff)
parentee6c3f9b4cf08a276c971dee66e1acdb32b3dff9 (diff)
Import Debian changes 0.4.2.3-1
hardinfo (0.4.2.3-1) unstable; urgency=low * New upstream release.(Closes: #454947)
Diffstat (limited to 'iconcache.c')
-rw-r--r--iconcache.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/iconcache.c b/iconcache.c
index 49325e39..ed7ce209 100644
--- a/iconcache.c
+++ b/iconcache.c
@@ -26,6 +26,8 @@ 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?");
}
}
@@ -48,7 +50,9 @@ GdkPixbuf *icon_cache_get_pixbuf(const gchar * file)
g_free(path);
}
- g_object_ref(icon);
+ if (icon) {
+ g_object_ref(icon);
+ }
return icon;
}
@@ -81,7 +85,9 @@ GdkPixbuf *icon_cache_get_pixbuf_at_size(const gchar * file, gint wid,
g_free(path);
}
- g_object_ref(icon);
+ if (icon) {
+ g_object_ref(icon);
+ }
return icon;
}