From 74a90453c307ef335076ebd89878a715a10889bd Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 5 Jul 2003 17:31:39 +0000 Subject: Api resync and cleanup from galeon. 2003-07-05 Marco Pesenti Gritti * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * src/prefs-dialog.c: (setup_font_menu): Api resync and cleanup from galeon. --- embed/mozilla/ContentHandler.cpp | 15 ++++++++++----- embed/mozilla/ContentHandler.h | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'embed/mozilla') diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index d06d3dbdd..332456b71 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -246,10 +246,20 @@ GContentHandler::~GContentHandler() // begin nsIHelperAppLauncher impl //////////////////////////////////////////////////////////////////////////////// +#if MOZILLA_SNAPSHOT > 8 /* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ +NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, + nsISupports *aContext, + PRBool aForced) +#else NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) +#endif { + /* aForced reflects if the content being sent is normally viewable + * in mozilla or not. That fact doesn't affect us, so ignore it + */ + nsresult rv; mLauncher = aLauncher; @@ -400,11 +410,6 @@ NS_METHOD GContentHandler::LaunchHelperApp (void) return NS_OK; } -NS_METHOD GContentHandler::ShowHelperProgressDialog (void) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - NS_METHOD GContentHandler::GetLauncher (nsIHelperAppLauncher * *_retval) { NS_IF_ADDREF (*_retval = mLauncher); diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 9d3cfca2e..d08cf6cbd 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -63,7 +63,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog NS_METHOD FindHelperApp (void); NS_METHOD LaunchHelperApp (void); - NS_METHOD ShowHelperProgressDialog (void); NS_METHOD GetLauncher (nsIHelperAppLauncher * *_retval); NS_METHOD GetContext (nsISupports * *_retval); -- cgit v1.2.3