aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-22 21:58:22 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-22 21:58:22 +0800
commitb9057aea437a712ccb7865268ec833588c177a8b (patch)
treecb2cc8a38acc5403f54fda20db41b1b98436e2b7 /embed
parentba54bad81b7e5fabde4ade81da5a4e1a7e567de4 (diff)
downloadgsoc2013-epiphany-b9057aea437a712ccb7865268ec833588c177a8b.tar.gz
gsoc2013-epiphany-b9057aea437a712ccb7865268ec833588c177a8b.tar.zst
gsoc2013-epiphany-b9057aea437a712ccb7865268ec833588c177a8b.zip
Don't use nsIURI::SetPassword, since it asserts when username is empty.
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.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EphyBrowser.cpp4
-rw-r--r--embed/mozilla/mozilla-embed.cpp5
2 files changed, 7 insertions, 2 deletions
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);