[epiphany/gnome-2-30] ephy-favicon-cache: remove invalid files on get
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/gnome-2-30] ephy-favicon-cache: remove invalid files on get
- Date: Mon, 30 Aug 2010 21:03:13 +0000 (UTC)
commit ebf497a3b205616375c6bbf99ca7f73fe1ea6a11
Author: Diego Escalante Urrelo <descalante igalia com>
Date: Sun Aug 22 16:08:49 2010 -0500
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
embed/ephy-favicon-cache.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index aa3b9be..3d588c5 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]