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, 32 insertions, 34 deletions

diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index b5169823b..60171f345 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -21,47 +21,45 @@
  */
 
 #include "mozilla-config.h"
-
 #include "config.h"
 
-#include "EphyUtils.h"
-#include "AutoJSContextStack.h"
-
-#include <nsIDOMWindow.h>
-#include <nsIServiceManager.h>
-#include <nsIInterfaceRequestor.h>
-#include <nsIInterfaceRequestorUtils.h>
-#undef MOZILLA_INTERNAL_API
-#include <nsEmbedString.h>
-#define MOZILLA_INTERNAL_API 1
-
+#include <glib/gi18n.h>
+#include <gtk/gtkcelllayout.h>
+#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkcombobox.h>
 #include <gtk/gtkdialog.h>
+#include <gtk/gtkexpander.h>
+#include <gtk/gtkhbox.h>
 #include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
 #include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkliststore.h>
 #include <gtk/gtkmenuitem.h>
+#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkprogressbar.h>
 #include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkliststore.h>
 #include <gtk/gtktreemodel.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <glib/gi18n.h>
+#include <gtk/gtkvbox.h>
 
-#include "GtkNSSClientAuthDialogs.h"
+#include <nsStringAPI.h>
 
+#include <nsIDOMWindow.h>
+#include <nsIInterfaceRequestor.h>
+#include <nsIInterfaceRequestorUtils.h>
+#include <nsIServiceManager.h>
+
+#include "ephy-debug.h"
 #include "ephy-gui.h"
 #include "ephy-state.h"
-#include "ephy-debug.h"
+
+#include "AutoJSContextStack.h"
+#include "EphyUtils.h"
+
+#include "GtkNSSClientAuthDialogs.h"
 
 GtkNSSClientAuthDialogs::GtkNSSClientAuthDialogs()
 {
@@ -201,8 +199,8 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 	
 
-	nsEmbedCString utf8_cn;
-	NS_UTF16ToCString (nsEmbedString (cn),
+	nsCString utf8_cn;
+	NS_UTF16ToCString (nsString (cn),
 			   NS_CSTRING_ENCODING_UTF8, utf8_cn);
 
 	msg = g_markup_printf_escaped (_("Choose a certificate to present as identification to “%s”."),
@@ -218,12 +216,12 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 	for (i = 0; i < count; i++)
 	{
-		nsEmbedCString certnick;
-		nsEmbedCString certdetail;
+		nsCString certnick;
+		nsCString certdetail;
 
-		NS_UTF16ToCString (nsEmbedString (certNickList[i]),
+		NS_UTF16ToCString (nsString (certNickList[i]),
 				   NS_CSTRING_ENCODING_UTF8, certnick);
-		NS_UTF16ToCString (nsEmbedString (certDetailsList[i]),
+		NS_UTF16ToCString (nsString (certDetailsList[i]),
 				   NS_CSTRING_ENCODING_UTF8, certdetail);
 
 		gtk_list_store_append (store, &iter);