diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 3 | ||||
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,13 @@ +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. + 2004-12-06 Christian Persch <chpe@cvs.gnome.org> * src/ephy-window.c: (ephy_window_destroy): 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); |