aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/ephy-embed-favicon.c21
-rwxr-xr-xsrc/toolbar.c2
3 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bcee893e4..afc934225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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.
+
+2003-01-04 Marco Pesenti Gritti <marco@it.gnome.org>
+
* configure.in:
* embed/mozilla/PromptService.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
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:
diff --git a/src/toolbar.c b/src/toolbar.c
index 059f1277d..24558e4a5 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -670,7 +670,7 @@ toolbar_update_favicon (Toolbar *t)
if (t->priv->favicon)
{
ephy_embed_favicon_set_embed (EPHY_EMBED_FAVICON (t->priv->favicon),
- ephy_window_get_active_embed (t->priv->window));
+ ephy_window_get_active_embed (t->priv->window));
}
}