diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/ephy-tab.c | 31 |
3 files changed, 12 insertions, 34 deletions
@@ -1,3 +1,13 @@ +2005-08-09 Christian Persch <chpe@cvs.gnome.org> + + * NEWS: + + Typo fixes. + + * src/ephy-tab.c: (ephy_tab_net_state_cb): + + Removed favicon fallback code. + 2005-08-08 Christian Persch <chpe@cvs.gnome.org> * configure.ac: @@ -15,8 +15,7 @@ Changes * Update the python bindings * String fixes [#172230, #167448] * Fix setting homepage to current page [#311962] - * ALlow EPHY_DEBUG_BREAK even in non-debug builds - * Fallback to favicon.ico [#116678] + * Allow EPHY_DEBUG_BREAK even in non-debug builds * Disable favicons from non-http URLs [#312291] * Fix location entry favicon updating * Fix crash on "window.get_toolbar()" [#170105] @@ -26,7 +25,7 @@ Changes * Fix drawing of location entry with new default GNOME theme (Clearlooks) * Change the text on the 'unknown issuer' dialog [#151519] * Also clear favicon cache when clearing the cache - * Make donwload dialog wording clearer + * Make download dialog wording clearer Contributors to this release: Crispin Flowerday, Christian Persch, Jean-François Rameau and Raphael Slinckx. diff --git a/src/ephy-tab.c b/src/ephy-tab.c index b843dd2cd..051a77f88 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -1239,36 +1239,6 @@ ephy_tab_set_icon_address (EphyTab *tab, } static void -ephy_tab_set_fallback_icon_address (EphyTab *tab) -{ - EphyTabPrivate *priv = tab->priv; - GnomeVFSURI *uri; - char *icon_address; - - /* If the site didn't specify a site icon, we fall back to - * favicon.ico, see bug #116678. - */ - - if (priv->icon_address != NULL || - priv->address == NULL || - !(g_str_has_prefix (priv->address, "http://") || - g_str_has_prefix (priv->address, "https://"))) return; - - uri = gnome_vfs_uri_new (priv->address); - if (uri == NULL) return; - - /* FIXME: support host:port ? */ - icon_address = g_strconcat (gnome_vfs_uri_get_scheme (uri), "://", - gnome_vfs_uri_get_host_name (uri), - "/favicon.ico", NULL); - - ephy_tab_set_icon_address (tab, icon_address); - - g_free (icon_address); - gnome_vfs_uri_unref (uri); -} - -static void ephy_tab_file_monitor_cancel (EphyTab *tab) { EphyTabPrivate *priv = tab->priv; @@ -1770,7 +1740,6 @@ ephy_tab_net_state_cb (EphyEmbed *embed, ephy_tab_set_load_percent (tab, 100); ephy_tab_set_load_status (tab, FALSE); ephy_tab_update_navigation_flags (tab, embed); - ephy_tab_set_fallback_icon_address (tab); g_free (priv->loading_title); priv->loading_title = NULL; |