aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/EphyBrowser.cpp11
-rw-r--r--src/ephy-tab.c9
3 files changed, 25 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d24a3a2e..9a9be3e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-05-06 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/EphyBrowser.cpp:
+ * src/ephy-tab.c: (ephy_tab_address_cb):
+
+ Use the document's URL as tab address, not the info from the
+ location changed signal.
+
+2005-05-06 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/MozDownload.cpp:
Set MozDownload as progress listener on the web browser persist.
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 0372fc13c..257624e95 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -229,8 +229,14 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
if (!shouldLoad) return NS_OK;
#endif
+ /* Hide password part */
+ favUri->SetPassword (nsEmbedCString ());
+
+ nsEmbedCString spec;
+ favUri->GetSpec (spec);
+
/* ok, we accept this as a valid favicon for this site */
- g_signal_emit_by_name (mOwner->mEmbed, "ge_favicon", faviconUrl.get());
+ g_signal_emit_by_name (mOwner->mEmbed, "ge_favicon", spec.get());
}
else if (g_ascii_strcasecmp (rel.get (), "alternate") == 0)
{
@@ -252,6 +258,9 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
rv = GetDocURI (linkElement, getter_AddRefs (docUri));
NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && docUri, NS_ERROR_FAILURE);
+ /* Hide password part */
+ docUri->SetPassword (nsEmbedCString ());
+
nsEmbedCString resolvedLink;
rv = docUri->Resolve (cLink, resolvedLink);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 075fd744f..263a8f5f9 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -1109,9 +1109,12 @@ ephy_tab_link_message_cb (EphyEmbed *embed,
}
static void
-ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
+ephy_tab_address_cb (EphyEmbed *embed,
+ const char *address,
+ EphyTab *tab)
{
const char *uv_address;
+ char *freeme = NULL;
LOG ("ephy_tab_address_cb tab %p address %s", tab, address);
@@ -1123,7 +1126,7 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
}
else
{
- uv_address = address;
+ uv_address = freeme = ephy_embed_get_location (embed, TRUE);
}
if (tab->priv->address_expire == EPHY_TAB_ADDRESS_EXPIRE_NOW)
@@ -1134,6 +1137,8 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
ephy_tab_set_link_message (tab, NULL);
ephy_tab_set_icon_address (tab, NULL);
ephy_tab_update_navigation_flags (tab, embed);
+
+ g_free (freeme);
}
static void