Drop support for gecko 1.7.

2006-05-10  Christian Persch  <chpe@cvs.gnome.org>

	* 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.

1 files changed, 17 insertions, 18 deletions

diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp
index 56f8c32a2..74aa3d8d7 100644
--- a/embed/mozilla/EphyHistoryListener.cpp
+++ b/embed/mozilla/EphyHistoryListener.cpp
@@ -19,30 +19,29 @@
  */
 
 #include "mozilla-config.h"
-
 #include "config.h"
 
-#include "EphyHistoryListener.h"
-#include "EphyUtils.h"
-
-#include "ephy-debug.h"
+#include <nsStringAPI.h>
 
-#undef MOZILLA_INTERNAL_API
-#include <nsEmbedString.h>
-#define MOZILLA_INTERNAL_API 1
 #include <nsCOMPtr.h>
-#include <nsIServiceManager.h>
+#include <nsCURILoader.h>
+#include <nsIChannel.h>
 #include <nsIDocumentLoader.h>
-#include <nsIWebProgress.h>
+#include <nsIHttpChannel.h>
+#include <nsIRequest.h>
 #include <nsIRequestObserver.h>
+#include <nsISupportsUtils.h>
 #include <nsIURI.h>
-#include <nsIRequest.h>
-#include <nsIChannel.h>
-#include <nsIHttpChannel.h>
+#include <nsIWebProgress.h>
 #include <nsNetCID.h>
-#include <nsISupportsUtils.h>
-#include <nsCURILoader.h>
+#include <nsServiceManagerUtils.h>
  
+#include "EphyUtils.h"
+
+#include "ephy-debug.h"
+
+#include "EphyHistoryListener.h"
+
 EphyHistoryListener::EphyHistoryListener ()
 {
 	LOG ("EphyHistoryListener ctor");
@@ -105,9 +104,9 @@ EphyHistoryListener::OnStateChange (nsIWebProgress *aWebProgress,
 	rv = channel->GetURI (getter_AddRefs (fromURI));
 	NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && fromURI, rv);
 
-	nsEmbedCString location;
+	nsCString location;
 	rv = httpChannel->GetResponseHeader
-		(nsEmbedCString ("Location"), location);
+		(nsCString ("Location"), location);
 	NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && location.Length(), rv);
 
 	nsCOMPtr<nsIURI> toURI;
@@ -115,7 +114,7 @@ EphyHistoryListener::OnStateChange (nsIWebProgress *aWebProgress,
 				nsnull /* use origin charset of fromURI */, fromURI);
 	NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && toURI, rv);
 
-	nsEmbedCString fromSpec, toSpec;
+	nsCString fromSpec, toSpec;
 	rv = fromURI->GetSpec (fromSpec);
 	rv |= toURI->GetSpec(toSpec);
 	NS_ENSURE_SUCCESS (rv, rv);