aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <descalante@igalia.com>2010-08-23 05:08:49 +0800
committerDiego Escalante Urrelo <descalante@igalia.com>2010-08-31 00:58:45 +0800
commitaedf2a28d8f136b6f5997dec6904a31e5cecc9fd (patch)
tree724858e0810d6e865ac34a3503551aa2a5b59d44
parenta5424f2cddc8b43852c3566940a8ee911a9a8b80 (diff)
downloadgsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar.gz
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar.bz2
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar.lz
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar.xz
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.tar.zst
gsoc2013-epiphany-aedf2a28d8f136b6f5997dec6904a31e5cecc9fd.zip
ephy-favicon-cache: remove invalid files on get
When calling ephy_favicon_cache_get we might hit an invalid file type that we didn't catch previously, delete it. Bug #618627
-rw-r--r--embed/ephy-favicon-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index aa3b9bea2..3d588c500 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -688,7 +688,6 @@ ephy_favicon_cache_get (EphyFaviconCache *cache,
is_ao = strcmp (mime_type, "application/octet-stream") == 0;
g_object_unref (file_info);
- g_object_unref (file);
/* As a special measure, we try to load an application/octet-stream file
* as an ICO file, since we cannot detect a ICO file without .ico extension
@@ -730,8 +729,9 @@ ephy_favicon_cache_get (EphyFaviconCache *cache,
else
{
/* remove invalid file from cache */
- /* gnome_vfs_unlink (pix_file); */
+ g_file_delete (file, NULL, NULL);
}
+ g_object_unref (file);
ephy_node_set_property_int (icon,
EPHY_NODE_FAVICON_PROP_CHECKED,