diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-04-29 02:06:17 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-04-29 02:06:17 +0800 |
| commit | 2ad7ec9867cdf9d3e15234ae04be48977c401e73 (patch) | |
| tree | 36260628577d598954b89aff60c10fba7a39fc28 /embed | |
| parent | 6aa9996fcf73ed953d194c32796396c35a1d51e7 (diff) | |
| download | gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar.gz gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar.bz2 gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar.lz gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar.xz gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.tar.zst gsoc2013-epiphany-2ad7ec9867cdf9d3e15234ae04be48977c401e73.zip | |
Ensure we have a DOM window before trying to get his url. The check was
2004-04-28 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/mozilla-embed.cpp:
Ensure we have a DOM window before trying to
get his url. The check was not working anymore
because of initialization changes.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp index d09bfca5e..54697db81 100644 --- a/embed/mozilla/EphyBrowser.cpp +++ b/embed/mozilla/EphyBrowser.cpp @@ -604,6 +604,8 @@ nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor) nsresult EphyBrowser::GetDocumentUrl (nsCString &url) { + if (!mDOMWindow) return NS_ERROR_FAILURE; + nsCOMPtr<nsIDOMDocument> DOMDocument; mDOMWindow->GetDocument (getter_AddRefs(DOMDocument)); NS_ENSURE_TRUE (DOMDocument, NS_ERROR_FAILURE); diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 3ab68b9ab..444e8bfc5 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -485,8 +485,6 @@ impl_get_location (EphyEmbed *embed, nsresult rv; nsCAutoString url; - if (mpriv->browser == NULL) return NULL; - if (toplevel) { rv = mpriv->browser->GetDocumentUrl (url); |