Update Mozilla requirements. Update the Mozilla milestone names to match

	* README: Update Mozilla requirements.
	* configure.in: Update the Mozilla milestone names to match the
	current Mozilla naming scheme.  Add a flag indicating whether the
	version of Mozilla we use has profiles support.
	* components/mozilla/Makefile.am:
	* components/mozilla/nautilus-mozilla-content-view.c:
	(pre_widget_initialize):
	Add better profile support ifdef hackery.

5 files changed, 28 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b06b03e6..d19407d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-16  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* README: Update Mozilla requirements.
+	* configure.in: Update the Mozilla milestone names to match the
+	current Mozilla naming scheme.  Add a flag indicating whether the
+	version of Mozilla we use has profiles support.
+	* components/mozilla/Makefile.am:
+	* components/mozilla/nautilus-mozilla-content-view.c:
+	(pre_widget_initialize): 
+	Add better profile support ifdef hackery.
+
 2001-02-15  Robey Pointer  <robey@eazel.com>
 
 	* components/services/install/idl/trilobite-eazel-install.idl:
diff --git a/README b/README
index ae7562c70..f3503ef43 100644
--- a/README
+++ b/README
@@ -213,12 +213,12 @@ Nautilus Mozilla component. This component can be optionally built
 with Nautilus. It is automatically enabled at configure time if
 Mozilla development libraries are detected on your system.
 
-Mozilla RPMs can be found here:
+The latest Mozilla RPMs that we require can be found here:
 
-	http://developer.eazel.com/eazel-hacking/updates/redhat62/mozilla/mozilla-0.7-11.i386.rpm
-	http://developer.eazel.com/eazel-hacking/updates/redhat62/mozilla/mozilla-devel-0.7-11.i386.rpm
+RedHat 6.x: http://developer.eazel.com/eazel-hacking/updates/redhat62/mozilla
+RedHat 7.x: http://developer.eazel.com/eazel-hacking/updates/redhat70/mozilla
 
-Replace "redhat62" with "redhat70" if you are using RedHat Linux 7.0.
+Currently the minimum Mozilla version we require is Mozilla 0.7.
 
 After installing these rpms, you can build nautilus with Mozilla
 support as follows:
diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am
index 037298355..f2781e767 100644
--- a/components/mozilla/Makefile.am
+++ b/components/mozilla/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"Nautilus-Mozilla\" \
 	-DDATADIR=\"$(datadir)\" \
 	$(MOZILLA_COMPONENT_DEBUG_FLAGS) \
+	$(MOZILLA_PROFILES_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(BONOBO_CFLAGS) \
@@ -67,12 +68,3 @@ ui_DATA =					\
 	$(NULL)
 
 EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(oaf_in_files)
-
-
-
-
-
-
-
-
-
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index b0032086f..b19f230bd 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -1351,7 +1351,7 @@ string_list_get_index_of_string (const char *string_list[], guint num_strings, c
  * things like cookies and cache.  Here we tell the mozilla embedding
  * widget to use ~/.nautilus/MozillaProfile for this purpose.
  *
- * We need mozilla M19 to support this feature.
+ * We need mozilla 0.8 to support this feature.
  */
 
 static void
@@ -1370,7 +1370,7 @@ pre_widget_initialize (void)
 	mkdir (profile_path, 0777);
 	mkdir (cache_path, 0777);
 
-#if (MOZILLA_MILESTONE >= 19)
+#ifdef MOZILLA_HAVE_PROFILES_SUPPORT
 	/* this will be in Mozilla 0.8 */
 	/* Its a bug in mozilla embedding that we need to cast the const away */
 	gtk_moz_embed_set_profile_path (profile_base_path, (char *) profile_directory_name);
diff --git a/configure.in b/configure.in
index fea243ac7..9ec65b3c8 100644
--- a/configure.in
+++ b/configure.in
@@ -341,15 +341,18 @@ dnl EVIL1:
 
 	if test $? -eq 0
 	then
-		MOZILLA_MILESTONE=19
+		MOZILLA_MILESTONE=VERSION_0_8
+		MOZILLA_PROFILES_CFLAGS="-DMOZILLA_HAVE_PROFILES_SUPPORT"
+
+		AC_SUBST(MOZILLA_PROFILES_CFLAGS)
 	else
 		grep -w GetName $_mozilla_include_place/nsIRequest.h > /dev/null 2>&1
 
 		if test $? -eq 0
 		then
-			MOZILLA_MILESTONE=18
+			MOZILLA_MILESTONE=VERSION_0_7
 		else
-			MOZILLA_MILESTONE=17
+			MOZILLA_MILESTONE=MILESTONE_17
 		fi
 	fi
 
@@ -372,12 +375,12 @@ dnl EVIL2:
 
 	AC_SUBST(MOZILLA_COMPONENT_DEBUG_FLAGS)
 
-	if test "$MOZILLA_MILESTONE" != "18" -a "$MOZILLA_MILESTONE" != "19"
+	if test "$MOZILLA_MILESTONE" != "VERSION_0_8" -a "$MOZILLA_MILESTONE" != "VERSION_0_7"
 	then
 
 	AC_MSG_ERROR([
-*** Mozilla M18 or greater is required to build the Nautilus Mozilla component.
-*** A package for M18 is available here:
+*** Mozilla 0.7 or greater is required to build the Nautilus Mozilla component.
+*** A package for 0.7 is available here:
 *** http://developer.eazel.com/eazel-hacking/updates/mozilla/.])
 
 	fi
@@ -909,6 +912,7 @@ Mozilla component	: YES
    mozilla libraries              : $_mozilla_lib_place
    mozilla includes               : $_mozilla_include_place
    MOZILLA_MILESTONE              : $MOZILLA_MILESTONE
+   MOZILLA_PROFILES_CFLAGS        : $MOZILLA_PROFILES_CFLAGS
    MOZILLA_COMPONENT_RPATH_FLAGS  : $MOZILLA_COMPONENT_RPATH_FLAGS
    MOZILLA_COMPONENT_DEBUG_FLAGS  : $MOZILLA_COMPONENT_DEBUG_FLAGS"
 ;;