diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 8 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 1 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2003-07-03 Xan Lopez <xan@masilla.org> + + * embed/mozilla/ContentHandler.cpp: + * embed/mozilla/ContentHandler.h: + + Sync with Moz Head, small cleanup. + 2003-07-03 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-topic-action.c: (build_bookmarks_menu): diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 6206b9d9a..4a0bbbd36 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -231,8 +231,7 @@ NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog) GContentHandler::GContentHandler() : mUri(nsnull), mMimeType(nsnull), - mDownloadCanceled(PR_FALSE), - mHelperProgress(PR_FALSE) + mDownloadCanceled(PR_FALSE) { NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ @@ -333,12 +332,14 @@ NS_IMETHODIMP GContentHandler:: } } +#if MOZILLA_SNAPSHOT < 9 /* void showProgressDialog (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_METHOD GContentHandler::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) { return NS_ERROR_NOT_IMPLEMENTED; } +#endif //////////////////////////////////////////////////////////////////////////////// // begin local public methods impl @@ -403,8 +404,7 @@ NS_METHOD GContentHandler::LaunchHelperApp (void) NS_METHOD GContentHandler::ShowHelperProgressDialog (void) { - mHelperProgress = PR_TRUE; - return ShowProgressDialog (mLauncher,mContext); + return NS_ERROR_NOT_IMPLEMENTED; } NS_METHOD GContentHandler::GetLauncher (nsIHelperAppLauncher * *_retval) diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 4a6d816d7..9d3cfca2e 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -92,7 +92,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog nsCString mScheme; PRBool mDownloadCanceled; - PRBool mHelperProgress; nsCOMPtr<nsIWebProgressListener> mListener; }; |