diff options
| author | Sergio Villar Senin <svillar@igalia.com> | 2012-03-08 01:28:02 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-03-20 18:55:11 +0800 |
| commit | 6119b95ca4c0c2d4d78b27422dfb6ba9203bab56 (patch) | |
| tree | 498151645cb0e38ba8854f738d749e04b39bb58c /src/ephy-history-window.c | |
| parent | bc0e3b41f8c21fa0b4bd0cd89e305b0fee049b6a (diff) | |
| download | gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar.gz gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar.bz2 gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar.lz gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar.xz gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.tar.zst gsoc2013-epiphany-6119b95ca4c0c2d4d78b27422dfb6ba9203bab56.zip | |
Replace EphyFaviconCache by WebKit's icon database cache
https://bugzilla.gnome.org/show_bug.cgi?id=648653
Diffstat (limited to 'src/ephy-history-window.c')
| -rw-r--r-- | src/ephy-history-window.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 5ddb0cb2e..39783b573 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -26,7 +26,6 @@ #include "ephy-bookmarks-ui.h" #include "ephy-debug.h" #include "ephy-dnd.h" -#include "ephy-favicon-cache.h" #include "ephy-file-helpers.h" #include "ephy-gui.h" #include "ephy-hosts-store.h" @@ -870,21 +869,22 @@ delete_event_cb (EphyHistoryWindow *editor) static void provide_favicon (EphyNode *node, GValue *value, gpointer user_data) { - EphyFaviconCache *cache; - const char *icon_location; + const char *page_location; GdkPixbuf *pixbuf = NULL; - cache = EPHY_FAVICON_CACHE - (ephy_embed_shell_get_favicon_cache (EPHY_EMBED_SHELL (ephy_shell))); - icon_location = ephy_node_get_property_string - (node, EPHY_NODE_PAGE_PROP_ICON); + page_location = ephy_node_get_property_string + (node, EPHY_NODE_PAGE_PROP_LOCATION); - LOG ("Get favicon for %s", icon_location ? icon_location : "None"); + LOG ("Get favicon for %s", page_location ? page_location : "None"); - if (icon_location) - { - pixbuf = ephy_favicon_cache_get (cache, icon_location); - } + if (page_location) + { + /* No need to use the async version as this function will be + called many times by the treeview. */ + WebKitFaviconDatabase *database = webkit_get_favicon_database (); + pixbuf = webkit_favicon_database_get_favicon_pixbuf (database, page_location, + FAVICON_SIZE, FAVICON_SIZE); + } g_value_init (value, GDK_TYPE_PIXBUF); g_value_take_object (value, pixbuf); |