A data/weasel-ua-pref.js.in:

2007-06-28  Christian Persch  <chpe@gnome.org>

	* configure.ac:
	* data/Makefile.am:
	A data/weasel-ua-pref.js.in:

        Make UA ff-compatible. This fixes
        https://bugzilla.mozilla.org/show_bug.cgi?id=334967 . See also
        Camino bug https://bugzilla.mozilla.org/show_bug.cgi?id=384721 and
        https://bugzilla.mozilla.org/show_bug.cgi?id=385999 for discussion.

svn path=/trunk/; revision=7100

4 files changed, 41 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e6067570..cc307a508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-28  Christian Persch  <chpe@gnome.org>
+
+	* configure.ac:
+	* data/Makefile.am:
+	A data/weasel-ua-pref.js.in:
+
+        Make UA ff-compatible. This fixes
+        https://bugzilla.mozilla.org/show_bug.cgi?id=334967 . See also
+        Camino bug https://bugzilla.mozilla.org/show_bug.cgi?id=384721 and
+        https://bugzilla.mozilla.org/show_bug.cgi?id=385999 for discussion.
+
 2007-06-26  Luca Ferretti  <elle.uca@libero.it>
 
 	* lib/ephy-stock-icons.h: use "document-page-setup" named icon for
diff --git a/configure.ac b/configure.ac
index 9a243a1be..0a7b78398 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,11 +192,29 @@ xulrunner) min_version=1.8 ;;
 *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
 esac
 
+AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner"])
+
 # Added $gecko_cv_gecko-js for debian xulrunner brokenness
 PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
 AC_SUBST([GECKO_CFLAGS])
 AC_SUBST([GECKO_LIBS])
 
+# *****************
+# Weasel UA version
+# *****************
+
+# FIXMEchpe: find a way to always automatically use the latest weasel minor version!
+
+if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+  WEASEL_UA_VERSION="3.0"
+elif test "$gecko_cv_gecko_version_int" -ge "1008001"; then
+  WEASEL_UA_VERSION="2.0.0.4"
+else
+  WEASEL_UA_VERSION="1.5.0.12"
+fi
+
+AC_SUBST([WEASEL_UA_VERSION])
+
 # **********************************
 # now tests for mozilla API variance
 # **********************************
@@ -661,6 +679,7 @@ data/icons/scalable/actions/Makefile
 data/icons/scalable/status/Makefile
 data/art/Makefile
 data/ui/Makefile
+data/weasel-ua-pref.js
 doc/Makefile
 doc/reference/Makefile
 lib/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 3c21e8cbe..f6f9fb124 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,6 +11,11 @@ default_prefs_in_FILES = \
 default_prefs_files = \
 	default-prefs-common.js
 
+
+if HAVE_XULRUNNER
+default_prefs_files += weasel-ua-pref.js
+endif
+
 default-prefs.js: $(default_prefs_files)
 	cat $^ > $@
 
diff --git a/data/weasel-ua-pref.js.in b/data/weasel-ua-pref.js.in
new file mode 100644
index 000000000..475d52cd8
--- /dev/null
+++ b/data/weasel-ua-pref.js.in
@@ -0,0 +1,6 @@
+// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes
+// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967]
+// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and
+// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do.
+// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999].
+pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@");