diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 4 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 5 |
4 files changed, 19 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2005-08-22 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EphyBrowser.cpp: + * embed/mozilla/mozilla-embed.cpp: + + Don't use nsIURI::SetPassword, since it asserts when username + is empty. Use GetUsername, SetUserPass instead. + +2005-08-22 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/GlobalHistory.cpp: Remove check for redirected URL. Fixes bug #313756. diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index a451738d6..3d9bfbeb4 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -276,6 +276,10 @@ be done by casting). @: @: @: +@: +@: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### --> diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index 03e2e51b2..c0087a625 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -257,7 +257,9 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent) NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && docUri, NS_ERROR_FAILURE); /* Hide password part */ - docUri->SetPassword (nsEmbedCString ()); + nsEmbedCString user; + docUri->GetUsername (user); + docUri->SetUserPass (user); nsEmbedCString resolvedLink; rv = docUri->Resolve (cLink, resolvedLink); diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index bf31d1fb6..461bbf002 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -580,7 +580,10 @@ impl_get_location (EphyEmbed *embed, rv = uri->Clone (getter_AddRefs (furi)); if (NS_FAILED (rv)) return NULL; - furi->SetPassword (nsEmbedCString()); + /* Hide password part */ + nsEmbedCString user; + furi->GetUsername (user); + furi->SetUserPass (user); nsEmbedCString url; furi->GetSpec (url); |