aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-01-05 04:28:47 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-01-05 04:28:47 +0800
commita3f1d414e8ae27d380fe224bdf4f0a9e9740285c (patch)
tree38676233cd4e3fefc89c69ea1bea2f1f2105d662 /embed
parentee75ead90dda40cfc066a52969ca2f91fe04ad95 (diff)
downloadgsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar.gz
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar.bz2
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar.lz
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar.xz
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.tar.zst
gsoc2013-epiphany-a3f1d414e8ae27d380fe224bdf4f0a9e9740285c.zip
Really update favicon when switching tab.
2003-01-04 Marco Pesenti Gritti <marco@it.gnome.org> * embed/ephy-embed-favicon.c: (update_url), (location_changed_cb), (ephy_embed_favicon_set_property): * src/toolbar.c: (toolbar_update_favicon): Really update favicon when switching tab.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-favicon.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/embed/ephy-embed-favicon.c b/embed/ephy-embed-favicon.c
index f1020441c..f7fa43e3b 100644
--- a/embed/ephy-embed-favicon.c
+++ b/embed/ephy-embed-favicon.c
@@ -119,15 +119,25 @@ ephy_embed_favicon_finalize (GObject *object)
}
static void
-location_changed_cb (EphyEmbed *embed,
- EphyEmbedFavicon *favicon)
+update_url (EphyEmbedFavicon *favicon)
{
char *location;
- ephy_embed_get_location (embed, TRUE, &location);
- ephy_favicon_set_url (EPHY_FAVICON (favicon), location);
+ ephy_embed_get_location (favicon->priv->embed,
+ TRUE, &location);
+
+ if (location)
+ {
+ ephy_favicon_set_url (EPHY_FAVICON (favicon), location);
+ g_free (location);
+ }
+}
- g_free (location);
+static void
+location_changed_cb (EphyEmbed *embed,
+ EphyEmbedFavicon *favicon)
+{
+ update_url (favicon);
}
static void
@@ -181,6 +191,7 @@ ephy_embed_favicon_set_property (GObject *object,
G_CALLBACK (location_changed_cb),
favicon,
0);
+ update_url (favicon);
}
break;
default: