diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +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. + 2004-04-28 Sebastian Heinlein <glatzor@pimpzkru.de> * help/C/epiphany.xml: 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); |