aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-12 04:12:48 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-12 04:12:48 +0800
commit594097cc0181cfea7e8205448a7b6e315e311a36 (patch)
tree8401a7431661f52e384a69bf9ce5cfc03e60a464 /src/ephy-window.c
parent67a3a6a3e873bf7972d76cee8396b8dec08fdcae (diff)
downloadgsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar.gz
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar.bz2
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar.lz
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar.xz
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.tar.zst
gsoc2013-epiphany-594097cc0181cfea7e8205448a7b6e315e311a36.zip
Reimplement favicons. Now all exit crashes related to connections left
2003-01-11 Marco Pesenti Gritti <marco@it.gnome.org> * embed/Makefile.am: * embed/ephy-embed-favicon.c: * embed/ephy-embed-favicon.h: * embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache): * embed/ephy-favicon-cache.c: (ephy_favicon_cache_class_init), (ephy_favicon_cache_new), (ephy_favicon_cache_load), (icon_is_obsolete), (icons_added_cb), (icons_removed_cb), (remove_obsolete_icons), (ephy_favicon_cache_save), (ephy_favicon_cache_init), (kill_download), (cleanup_downloads_hash), (ephy_favicon_cache_finalize), (favicon_name_build), (favicon_download_completed_cb), (ephy_favicon_cache_download), (ephy_favicon_cache_get): * embed/ephy-favicon-cache.h: * embed/ephy-favicon.c: * embed/ephy-favicon.h: * embed/mozilla/mozilla-embed-shell.cpp: * src/ephy-tab.c: (ephy_tab_init), (ephy_tab_favicon_cb), (ephy_tab_location_cb), (ephy_tab_get_location), (ephy_tab_get_favicon_url): * src/ephy-tab.h: * src/ephy-window.c: (update_favicon_control): * src/toolbar.c: (toolbar_setup_favicon_ebox), (toolbar_update_favicon): Reimplement favicons. Now all exit crashes related to connections left open by favicons should be fixed.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index dcba93e42..9f751ea8b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1086,12 +1086,12 @@ update_favicon_control (EphyWindow *window)
cache = ephy_embed_shell_get_favicon_cache
(EPHY_EMBED_SHELL (ephy_shell));
- location = ephy_tab_get_location (window->priv->active_tab);
+ location = ephy_tab_get_favicon_url (window->priv->active_tab);
if (location)
{
GdkPixbuf *pixbuf;
- pixbuf = ephy_favicon_cache_lookup_direct (cache, location);
+ pixbuf = ephy_favicon_cache_get (cache, location);
gtk_window_set_icon (GTK_WINDOW (window), pixbuf);
}