diff options
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 7ab8cf956..949077ca3 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -49,7 +49,6 @@ #include "ephy-tabs-menu.h" #include "ephy-stock-icons.h" #include "ephy-extension.h" -#include "ephy-favicon-cache.h" #include "ephy-link.h" #include "ephy-gui.h" #include "ephy-notebook.h" @@ -1193,33 +1192,19 @@ sync_tab_document_type (EphyTab *tab, } static void -sync_tab_icon (EphyTab *tab, GParamSpec *pspec, EphyWindow *window) +sync_tab_icon (EphyTab *tab, + GParamSpec *pspec, + EphyWindow *window) { - const char *address; - EphyFaviconCache *cache; - GdkPixbuf *pixbuf = NULL; - - if (window->priv->closing) return; - - cache = EPHY_FAVICON_CACHE - (ephy_embed_shell_get_favicon_cache - (EPHY_EMBED_SHELL (ephy_shell))); - - address = ephy_tab_get_icon_address (tab); - - if (address) - { - pixbuf = ephy_favicon_cache_get (cache, address); - } + EphyWindowPrivate *priv = window->priv; + GdkPixbuf *icon; - gtk_window_set_icon (GTK_WINDOW (window), pixbuf); + if (priv->closing) return; - ephy_toolbar_set_favicon (window->priv->toolbar, address); + icon = ephy_tab_get_icon (tab); - if (pixbuf) - { - g_object_unref (pixbuf); - } + gtk_window_set_icon (GTK_WINDOW (window), icon); + ephy_toolbar_set_favicon (priv->toolbar, icon); } static void |