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.

2 files changed, 2 insertions, 19 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8534a01ba..14ecf0f8e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1473,9 +1473,8 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
 			stock_id = STOCK_LOCK_BROKEN;
 			show_lock = TRUE;
 
-			/* Change to HAVE_GECKO_1_8_1 once https://bugzilla.mozilla.org/show_bug.cgi?id=251123 is checked in there */
-#ifndef HAVE_GECKO_1_9
-			/* In Gecko 1.9, we get a useful tooltip here */
+#ifndef HAVE_GECKO_1_8_1
+			/* In Gecko 1.8.1/1.9, we get a useful tooltip here */
 			g_free (description);
 			description = NULL;
 #endif
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index fc912f1f8..eedc1ffdc 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -128,12 +128,10 @@ enum
 	MIN_SIZE_PROP,
 	FONT_PREFS_BUTTON_PROP,
 	USE_COLORS_PROP,
-#ifdef HAVE_GECKO_1_8
 	CSS_CONTAINER_PROP,
 	CSS_CHECKBOX_PROP,
 	CSS_EDIT_BOX_PROP,
 	CSS_EDIT_BUTTON_PROP,
-#endif
 
 	/* Privacy */
 	ALLOW_POPUPS_PROP,
@@ -174,12 +172,10 @@ EphyDialogProperty properties [] =
 	{ "min_size_spinbutton",	CONF_RENDERING_FONT_MIN_SIZE,	PT_AUTOAPPLY,	0 },
 	{ "font_prefs_button",		NULL,				PT_NORMAL,	0 },
 	{ "use_colors_checkbutton",	CONF_RENDERING_USE_OWN_COLORS,	PT_AUTOAPPLY | PT_INVERTED,	0 },
-#ifdef HAVE_GECKO_1_8
 	{ "css_container",		NULL,				PT_NORMAL,	0 },
 	{ "css_checkbox",		CONF_USER_CSS_ENABLED,		PT_AUTOAPPLY,	0 },
 	{ "css_edit_box",		NULL,				PT_NORMAL,	0 },
 	{ "css_edit_button",		NULL,				PT_NORMAL,	0 },
-#endif
 
 	/* Privacy */
 	{ "popups_allow_checkbutton",		CONF_SECURITY_ALLOW_POPUPS,	  PT_AUTOAPPLY, 0 },
@@ -636,8 +632,6 @@ font_prefs_button_clicked_cb (GtkWidget *button,
 	ephy_dialog_show (priv->fonts_dialog);
 }
 
-#ifdef HAVE_GECKO_1_8
-
 static void
 css_checkbox_toggled (GtkToggleButton *button,
 		      GtkWidget *widget)
@@ -663,8 +657,6 @@ css_edit_button_clicked_cb (GtkWidget *button,
 	g_free (uri);
 }
 
-#endif /* HAVE_GECKO_1_8 */
-
 static void
 create_node_combo (EphyDialog *dialog,
 		   int prop,
@@ -1531,9 +1523,7 @@ prefs_dialog_init (PrefsDialog *pd)
 	EphyEncodings *encodings;
 	GtkWidget *window, *curr_button, *blank_button;
 	GtkWidget *clear_cache_button, *font_prefs_button;
-#ifdef HAVE_GECKO_1_8
 	GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
-#endif
 	gboolean sensitive;
 
 	pd->priv = EPHY_PREFS_DIALOG_GET_PRIVATE (pd);
@@ -1553,12 +1543,10 @@ prefs_dialog_init (PrefsDialog *pd)
 		 properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
 		 properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
 		 properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
-#ifdef HAVE_GECKO_1_8
 		 properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
 		 properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
 		 properties[CSS_EDIT_BUTTON_PROP].id, &css_edit_button,
 		 properties[CSS_CONTAINER_PROP].id, &css_container,
-#endif
 		 properties[CLEAR_CACHE_BUTTON_PROP].id, &clear_cache_button,
 		 NULL);
 
@@ -1580,7 +1568,6 @@ prefs_dialog_init (PrefsDialog *pd)
 	g_signal_connect (font_prefs_button, "clicked",
 			  G_CALLBACK (font_prefs_button_clicked_cb), dialog);
 
-#ifdef HAVE_GECKO_1_8
 	css_checkbox_toggled (GTK_TOGGLE_BUTTON (css_checkbox), css_edit_box);
 	g_signal_connect (css_checkbox, "toggled",
 			  G_CALLBACK (css_checkbox_toggled), css_edit_box);
@@ -1588,9 +1575,6 @@ prefs_dialog_init (PrefsDialog *pd)
 	g_signal_connect (css_edit_button, "clicked",
 			  G_CALLBACK (css_edit_button_clicked_cb), dialog);
 
-	gtk_widget_show (css_container);
-#endif
-
 	g_signal_connect (clear_cache_button, "clicked",
 			  G_CALLBACK (prefs_clear_cache_button_clicked_cb), dialog);