From 24b71aa8ac7de8dd140092705bb7cc439f6b3309 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 10 May 2006 18:07:03 +0000 Subject: Drop support for gecko 1.7. 2006-05-10 Christian Persch * configure.ac: * data/glade/prefs-dialog.glade: * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get): * embed/mozilla/AutoJSContextStack.cpp: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EphyAboutModule.cpp: * embed/mozilla/EphyAboutModule.h: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/EphyContentPolicy.cpp: * embed/mozilla/EphyContentPolicy.h: * embed/mozilla/EphyDirectoryProvider.cpp: * embed/mozilla/EphyFind.cpp: * embed/mozilla/EphyFind.h: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphyHeaderSniffer.h: * embed/mozilla/EphyHistoryListener.cpp: * embed/mozilla/EphyHistoryListener.h: * embed/mozilla/EphyPromptService.cpp: * embed/mozilla/EphySidebar.cpp: * embed/mozilla/EphySidebar.h: * embed/mozilla/EphySingle.cpp: * embed/mozilla/EphySingle.h: * embed/mozilla/EphyUtils.cpp: * embed/mozilla/EphyUtils.h: * embed/mozilla/EventContext.cpp: * embed/mozilla/EventContext.h: * embed/mozilla/FilePicker.cpp: * embed/mozilla/FilePicker.h: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/GlobalHistory.h: * embed/mozilla/GtkNSSClientAuthDialogs.cpp: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: * embed/mozilla/GtkNSSSecurityWarningDialogs.h: * embed/mozilla/Makefile.am: * embed/mozilla/MozDownload.cpp: * embed/mozilla/MozDownload.h: * embed/mozilla/MozRegisterComponents.cpp: * embed/mozilla/MozRegisterComponents.h: * embed/mozilla/MozillaPrivate.cpp: * embed/mozilla/MozillaPrivate.h: * embed/mozilla/PrintingPromptService.cpp: * embed/mozilla/PrintingPromptService.h: * embed/mozilla/mozilla-download.cpp: * embed/mozilla/mozilla-download.h: * embed/mozilla/mozilla-embed-event.cpp: * embed/mozilla/mozilla-embed-event.h: * embed/mozilla/mozilla-embed-find.cpp: * embed/mozilla/mozilla-embed-find.h: * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-persist.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: * embed/mozilla/mozilla-embed.h: * embed/mozilla/mozilla-notifiers.cpp: * embed/mozilla/mozilla-notifiers.h: * embed/mozilla/mozilla-x509-cert.cpp: * embed/mozilla/mozilla-x509-cert.h: * lib/ephy-gui.c: * lib/ephy-gui.h: * lib/ephy-langs.c: * m4/gecko.m4: * src/ephy-window.c: (sync_tab_security): * src/prefs-dialog.c: (prefs_dialog_init): Drop support for gecko 1.7. --- embed/mozilla/FilePicker.cpp | 59 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 32 deletions(-) (limited to 'embed/mozilla/FilePicker.cpp') diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index 43b6b3688..d3445919a 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -20,38 +20,33 @@ */ #include "mozilla-config.h" - #include "config.h" -#include "FilePicker.h" -#include "EphyUtils.h" -#include "AutoJSContextStack.h" +#include +#include +#include +#include +#include + +#include #include -#undef MOZILLA_INTERNAL_API -#include -#define MOZILLA_INTERNAL_API 1 -#include -#include +#include #include #include #include -#include +#include +#include #include -#ifndef MOZ_NSIFILEPICKER_NSASTRING_ -#include -#endif - -#include "ephy-prefs.h" -#include "ephy-gui.h" #include "ephy-debug.h" +#include "ephy-gui.h" +#include "ephy-prefs.h" -#include -#include -#include -#include -#include +#include "AutoJSContextStack.h" +#include "EphyUtils.h" + +#include "FilePicker.h" NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker) @@ -87,11 +82,11 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *t NS_ENSURE_TRUE (gtkparent, NS_ERROR_FAILURE); #endif - nsEmbedCString cTitle; + nsCString cTitle; #ifdef MOZ_NSIFILEPICKER_NSASTRING_ NS_UTF16ToCString (title, NS_CSTRING_ENCODING_UTF8, cTitle); #else - NS_UTF16ToCString (nsEmbedString(title), NS_CSTRING_ENCODING_UTF8, cTitle); + NS_UTF16ToCString (nsString(title), NS_CSTRING_ENCODING_UTF8, cTitle); #endif mMode = mode; @@ -205,11 +200,11 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar if (!filter) return NS_ERROR_FAILURE; #endif - nsEmbedCString pattern; + nsCString pattern; #ifdef MOZ_NSIFILEPICKER_NSASTRING_ NS_UTF16ToCString (filter, NS_CSTRING_ENCODING_UTF8, pattern); #else - NS_UTF16ToCString (nsEmbedString(filter), NS_CSTRING_ENCODING_UTF8, pattern); + NS_UTF16ToCString (nsString(filter), NS_CSTRING_ENCODING_UTF8, pattern); #endif char **patterns; @@ -224,11 +219,11 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar gtk_file_filter_add_pattern (filth, g_strstrip (patterns[i])); } - nsEmbedCString cTitle; + nsCString cTitle; #ifdef MOZ_NSIFILEPICKER_NSASTRING_ NS_UTF16ToCString (title, NS_CSTRING_ENCODING_UTF8, cTitle); #else - NS_UTF16ToCString (nsEmbedString(title), NS_CSTRING_ENCODING_UTF8, cTitle); + NS_UTF16ToCString (nsString(title), NS_CSTRING_ENCODING_UTF8, cTitle); #endif gtk_file_filter_set_name (filth, cTitle.get()); @@ -272,7 +267,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString) if (mMode == nsIFilePicker::modeSave) { - nsEmbedCString defaultString; + nsCString defaultString; NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_UTF8, defaultString); @@ -338,7 +333,7 @@ NS_IMETHODIMP GFilePicker::GetDisplayDirectory(nsILocalFile **aDisplayDirectory) if (dir != NULL) { nsCOMPtr file = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID); - file->InitWithNativePath (nsEmbedCString (dir)); + file->InitWithNativePath (nsCString (dir)); NS_IF_ADDREF (*aDisplayDirectory = file); g_free (dir); @@ -351,14 +346,14 @@ NS_IMETHODIMP GFilePicker::SetDisplayDirectory(nsILocalFile *aDisplayDirectory) { NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE); - nsEmbedCString dir; + nsCString dir; aDisplayDirectory->GetNativePath (dir); LOG ("GFilePicker::SetDisplayDirectory to %s", dir.get()); if (mDefaultString.Length() && mMode != nsIFilePicker::modeSave) { - nsEmbedCString defaultString; + nsCString defaultString; NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM, defaultString); @@ -390,7 +385,7 @@ NS_IMETHODIMP GFilePicker::GetFile(nsILocalFile **aFile) if (filename != NULL) { nsCOMPtr file = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID); - file->InitWithNativePath (nsEmbedCString (filename)); + file->InitWithNativePath (nsCString (filename)); NS_IF_ADDREF (*aFile = file); g_free (filename); -- cgit v1.2.3