diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/ephy-tab.c | 14 |
2 files changed, 12 insertions, 9 deletions
@@ -1,5 +1,12 @@ 2005-08-17 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-tab.c: (ephy_tab_set_loading_title), + + Better fix: reorder again and use priv->title for + the set_loading_title call after the set_title call. + +2005-08-17 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EventContext.cpp: QI the element to check whether it's of some type, diff --git a/src/ephy-tab.c b/src/ephy-tab.c index a0f1ed390..2236cdd18 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -898,8 +898,6 @@ ephy_tab_set_loading_title (EphyTab *tab, g_free (priv->loading_title); priv->loading_title = NULL; - if (title == NULL) return; - if (is_address) { title = freeme = get_title_from_address (title); @@ -1562,19 +1560,17 @@ ephy_tab_zoom_changed_cb (EphyEmbed *embed, float zoom, EphyTab *tab) } static void -ephy_tab_title_cb (EphyEmbed *embed, EphyTab *tab) +ephy_tab_title_cb (EphyEmbed *embed, + EphyTab *tab) { + EphyTabPrivate *priv = tab->priv; GObject *object = G_OBJECT (tab); - char *title; - - title = ephy_embed_get_title (embed); g_object_freeze_notify (object); - ephy_tab_set_loading_title (tab, title, FALSE); + ephy_tab_set_title (tab, embed, ephy_embed_get_title (embed)); - /* this consumes and/or frees |title| ! */ - ephy_tab_set_title (tab, embed, title); + ephy_tab_set_loading_title (tab, priv->title, FALSE); g_object_thaw_notify (object); } |