diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-04-29 18:41:10 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-04-29 18:41:10 +0800 |
| commit | 25d492ed43d4bb06fe9e1589950d2a349917bce2 (patch) | |
| tree | c193c6890bf4401a597c8bd796f4709c2f5bf67a /embed/mozilla/ContentHandler.cpp | |
| parent | 4bc8882e3270c7bd044ae32984686343ddc89cad (diff) | |
| download | gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.gz gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.zst gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.zip | |
More defines work, still lack EventContext and EmbedPrivate. Use mozilla
2004-04-29 Marco Pesenti Gritti <marco@gnome.org>
* configure.in:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EphyAboutRedirector.cpp:
* embed/mozilla/EphyAboutRedirector.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyContentPolicy.cpp:
* embed/mozilla/EphyContentPolicy.h:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphyHeaderSniffer.h:
* embed/mozilla/EphySingle.cpp:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/GlobalHistory.h:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSClientAuthDialogs.h:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.h:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.h:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
More defines work, still lack EventContext and
EmbedPrivate.
Use mozilla like warning flags instead of those gnome
macros. Remove several unused variables.
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 489ab72ae..f980c692c 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -25,25 +25,6 @@ #include "config.h" #endif -#include "ContentHandler.h" -#include "MozillaPrivate.h" -#include "MozDownload.h" - -#include "nsCOMPtr.h" -#include "nsString.h" -#include "nsIURL.h" -#include "nsILocalFile.h" -#include "nsIMIMEInfo.h" -#include "nsIInterfaceRequestorUtils.h" - -#include "ephy-prefs.h" -#include "eel-gconf-extensions.h" -#include "ephy-embed-single.h" -#include "ephy-embed-shell.h" -#include "ephy-file-chooser.h" -#include "ephy-stock-icons.h" -#include "ephy-debug.h" - #include <gtk/gtkimage.h> #include <gtk/gtkhbox.h> #include <gtk/gtkvbox.h> @@ -54,6 +35,24 @@ #include <libgnomevfs/gnome-vfs-utils.h> #include <glib/gi18n.h> +#include <nsIURL.h> +#include <nsILocalFile.h> +#include <nsIMIMEInfo.h> +#include <nsIInterfaceRequestorUtils.h> +#include "nsCExternalHandlerService.h" + +#include "ephy-prefs.h" +#include "ephy-embed-single.h" +#include "ephy-embed-shell.h" +#include "ephy-file-chooser.h" +#include "ephy-stock-icons.h" +#include "ephy-debug.h" +#include "eel-gconf-extensions.h" + +#include "ContentHandler.h" +#include "MozillaPrivate.h" +#include "MozDownload.h" + class GContentHandler; NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog) @@ -170,7 +169,6 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile( NS_METHOD GContentHandler::LaunchHelperApp (void) { - nsresult rv; nsCOMPtr<nsIExternalHelperAppService> helperService; helperService = do_GetService (NS_EXTERNALHELPERAPPSERVICE_CONTRACTID); @@ -340,7 +338,6 @@ NS_METHOD GContentHandler::MIMEConfirmAction () NS_METHOD GContentHandler::MIMEDoAction (void) { - nsresult rv; gboolean auto_downloads; if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK; |