Just replace the check for broken reload by HAVE_GECKO_1_8.

2005-05-14  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/mozilla-embed.cpp:

	Just replace the check for broken reload by HAVE_GECKO_1_8.

5 files changed, 14 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index de8950c32..602926d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-14  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.ac:
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EphyBrowser.h:
+	* embed/mozilla/mozilla-embed.cpp:
+
+	Just replace the check for broken reload by HAVE_GECKO_1_8.
+
 2005-05-12  Jean-François Rameau  <jframeau@cvs.gnome.org>
 
 	* embed/ephy-embed.h:
diff --git a/configure.ac b/configure.ac
index c2fceb13c..a194562b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,20 +375,6 @@ AC_COMPILE_IFELSE(
 
 AC_MSG_RESULT([$result])
 
-dnl check for broken reload in GtkMozEmbed
-dnl This is fixed since 1.7.4 on 1.7 branch, and since 1.8a3 on trunk
-
-AC_MSG_CHECKING([for broken reload])
-
-if $PKG_CONFIG --atleast-version=1.7.5 $MOZILLA-gtkmozembed; then
-	broken_reload=no
-else
-	broken_reload="couldn't autodetect, assuming yes"
-	AC_DEFINE([GTKMOZEMBED_BROKEN_RELOAD],[1],[Define if GtkMozEmbed has broken reload])
-fi
-
-AC_MSG_RESULT([$broken_reload])
-
 dnl changed location in 1.8a6
 
 AC_MSG_CHECKING([for mozilla security compoment])
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index f0147ed33..85a0a9f8c 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -806,7 +806,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index)
 	return ContentNav->GotoIndex (index);
 }
 
-#ifdef GTKMOZEMBED_BROKEN_RELOAD
+#ifndef HAVE_GECKO_1_8
 /* Workaround for broken reload with frames, see mozilla bug
  * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
  */
@@ -844,7 +844,7 @@ nsresult EphyBrowser::Reload (ReloadType flags)
 
 	return webNavigation->Reload (reloadFlags);
 }
-#endif
+#endif /* !HAVE_GECKO_1_8 */
 
 nsresult EphyBrowser::SetZoom (float aZoom)
 {
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 195d26f64..31c2699e1 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -153,7 +153,7 @@ public:
 	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
 	nsresult GoToHistoryIndex (PRInt16 index);
 
-#ifdef GTKMOZEMBED_BROKEN_RELOAD
+#ifndef HAVE_GECKO_1_8
 	enum ReloadType { RELOAD_NORMAL		 = 0,
 			  RELOAD_FORCE		 = 1,
 			  RELOAD_ENCODING_CHANGE = 2 };
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 6afcdf82d..109f7ea76 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -509,7 +509,7 @@ static void
 impl_reload (EphyEmbed *embed, 
              gboolean force)
 {
-#ifndef GTKMOZEMBED_BROKEN_RELOAD
+#ifdef HAVE_GECKO_1_8
 	guint32 mflags;
 
 	mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
@@ -724,7 +724,7 @@ impl_set_encoding (EphyEmbed *embed,
 		if (NS_FAILED (rv)) return;
 	}
 
-#ifndef GTKMOZEMBED_BROKEN_RELOAD
+#ifdef HAVE_GECKO_1_8
 	gtk_moz_embed_reload (GTK_MOZ_EMBED (embed),
 			      GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE);
 #else