diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-12-13 06:22:19 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-12-13 06:22:19 +0800 |
| commit | 0912cf63ef6b9462f6677a59a1d0c99d14c39e93 (patch) | |
| tree | 67ed49b1f98f95c17e3036bd1e5a576a4e9ea578 /embed | |
| parent | ad0e40ea9372a00fa040bd061c05580792e0f246 (diff) | |
| download | gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar.gz gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar.bz2 gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar.lz gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar.xz gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.tar.zst gsoc2013-epiphany-0912cf63ef6b9462f6677a59a1d0c99d14c39e93.zip | |
Back out the fix for bug #158466, it's wrong.
2004-12-12 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/ContentHandler.cpp:
Back out the fix for bug #158466, it's wrong.
* embed/mozilla/EphyBrowser.h:
Fix compile in !MOZILLA_HAVE_PSM case.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 3 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 8a15b39e6..1922e2497 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -339,8 +339,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void) mLauncher->GetMIMEInfo(getter_AddRefs(mimeInfo)); NS_ENSURE_TRUE (mimeInfo, NS_ERROR_FAILURE); - if (mAction == CONTENT_ACTION_OPEN || - mAction == CONTENT_ACTION_OPEN_TMP) + if (mAction == CONTENT_ACTION_OPEN) { nsEmbedString desc; diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index 925aeff88..b61a88ec1 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -156,11 +156,13 @@ private: nsCOMPtr<nsIDOMDocument> mTargetDocument; nsCOMPtr<nsIDOMEventTarget> mEventTarget; nsCOMPtr<nsIDOMWindow> mDOMWindow; - nsCOMPtr<nsISecureBrowserUI> mSecurityInfo; EphyFaviconEventListener *mFaviconEventListener; EphyPopupBlockEventListener *mPopupBlockEventListener; EphyModalAlertEventListener *mModalAlertListener; PRBool mInitialized; +#ifdef HAVE_MOZILLA_PSM + nsCOMPtr<nsISecureBrowserUI> mSecurityInfo; +#endif nsresult GetListener (void); nsresult AttachListeners (void); |