From 6119b95ca4c0c2d4d78b27422dfb6ba9203bab56 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 7 Mar 2012 18:28:02 +0100 Subject: Replace EphyFaviconCache by WebKit's icon database cache https://bugzilla.gnome.org/show_bug.cgi?id=648653 --- embed/ephy-embed-shell.c | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'embed/ephy-embed-shell.c') diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index cda96e2e0..3b521f18a 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -34,7 +34,6 @@ #include "ephy-embed-single.h" #include "ephy-embed-type-builtins.h" #include "ephy-encodings.h" -#include "ephy-favicon-cache.h" #include "ephy-file-helpers.h" #include "ephy-history.h" #include "ephy-history-service.h" @@ -54,7 +53,6 @@ struct _EphyEmbedShellPrivate EphyHistory *global_history; EphyHistoryService *global_history_service; GList *downloads; - EphyFaviconCache *favicon_cache; EphyEmbedSingle *embed_single; EphyEncodings *encodings; EphyAdBlockManager *adblock_manager; @@ -96,13 +94,6 @@ ephy_embed_shell_dispose (GObject *object) EphyEmbedShell *shell = EPHY_EMBED_SHELL (object); EphyEmbedShellPrivate *priv = shell->priv; - if (priv->favicon_cache != NULL) - { - LOG ("Unref favicon cache"); - g_object_unref (priv->favicon_cache); - priv->favicon_cache = NULL; - } - if (priv->encodings != NULL) { LOG ("Unref encodings"); @@ -166,27 +157,6 @@ ephy_embed_shell_finalize (GObject *object) G_OBJECT_CLASS (ephy_embed_shell_parent_class)->finalize (object); } -/** - * ephy_embed_shell_get_favicon_cache: - * @shell: the #EphyEmbedShell - * - * Returns the favicons cache. - * - * Return value: (transfer none): the favicons cache - **/ -GObject * -ephy_embed_shell_get_favicon_cache (EphyEmbedShell *shell) -{ - g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL); - - if (shell->priv->favicon_cache == NULL) - { - shell->priv->favicon_cache = ephy_favicon_cache_new (); - } - - return G_OBJECT (shell->priv->favicon_cache); -} - /** * ephy_embed_shell_get_global_history: * @shell: the #EphyEmbedShell -- cgit v1.2.3