diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-07-06 01:31:39 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-07-06 01:31:39 +0800 |
| commit | 74a90453c307ef335076ebd89878a715a10889bd (patch) | |
| tree | 6971f9d1d0004c7f11727deb55f73702348549b5 /embed/mozilla | |
| parent | 23c8a4bef0c6006724043a428f3e5b5ca485e49f (diff) | |
| download | gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar.gz gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar.bz2 gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar.lz gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar.xz gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.tar.zst gsoc2013-epiphany-74a90453c307ef335076ebd89878a715a10889bd.zip | |
Api resync and cleanup from galeon.
2003-07-05 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* src/prefs-dialog.c: (setup_font_menu):
Api resync and cleanup from galeon.
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 15 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 1 |
2 files changed, 10 insertions, 6 deletions
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); |