--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/altoptions.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/altoptions.m4
@@ -55,7 +55,7 @@
dnl MOZ_TWO_STRING_TEST(NAME, VAL, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
-AC_DEFUN(MOZ_TWO_STRING_TEST,
+AC_DEFUN([MOZ_TWO_STRING_TEST],
[if test "[$2]" = "[$3]"; then
ifelse([$4], , :, [$4])
elif test "[$2]" = "[$5]"; then
@@ -67,23 +67,23 @@
fi])
dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
+AC_DEFUN([MOZ_ARG_ENABLE_BOOL],
[AC_ARG_ENABLE([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4])],
[$5])])
dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
-AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
+AC_DEFUN([MOZ_ARG_DISABLE_BOOL],
[AC_ARG_ENABLE([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])],
[$5])])
dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_ENABLE_STRING,
+AC_DEFUN([MOZ_ARG_ENABLE_STRING],
[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
-AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
+AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING],
[ifelse([$5], ,
[errprint([Option, $1, needs an "IF-SET" argument.
])
@@ -93,19 +93,19 @@
[$6])])])
dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_BOOL,
+AC_DEFUN([MOZ_ARG_WITH_BOOL],
[AC_ARG_WITH([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])],
[$5])])
dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
-AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
+AC_DEFUN([MOZ_ARG_WITHOUT_BOOL],
[AC_ARG_WITH([$1], [$2],
[MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])],
[$5])])
dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
-AC_DEFUN(MOZ_ARG_WITH_STRING,
+AC_DEFUN([MOZ_ARG_WITH_STRING],
[AC_ARG_WITH([$1], [$2], [$3], [$4])])
dnl MOZ_ARG_HEADER(Comment)
@@ -118,7 +118,7 @@
dnl using it
dnl
dnl MOZ_CHECK_PTHREADS(lib, success, failure)
-AC_DEFUN(MOZ_CHECK_PTHREADS,
+AC_DEFUN([MOZ_CHECK_PTHREADS],
[
AC_MSG_CHECKING([for pthread_create in -l$1])
echo "
@@ -145,7 +145,7 @@
])
dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
-AC_DEFUN(MOZ_READ_MOZCONFIG,
+AC_DEFUN([MOZ_READ_MOZCONFIG],
[AC_REQUIRE([AC_INIT_BINSH])dnl
# Read in '.mozconfig' script to set the initial options.
# See the mozconfig2configure script for more details.
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/freetype2.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/freetype2.m4
@@ -4,7 +4,7 @@
dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
dnl
-AC_DEFUN(AC_CHECK_FT2,
+AC_DEFUN([AC_CHECK_FT2],
[dnl
dnl Get the cflags and libraries from the freetype-config script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/glib.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/glib.m4
@@ -5,7 +5,7 @@
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config
dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
[dnl
dnl Get the cflags and libraries from the glib-config script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/gtk.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/gtk.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/libIDL-2.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/libIDL-2.m4
@@ -3,7 +3,7 @@
dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBIDL_2,
+AC_DEFUN([AM_PATH_LIBIDL_2],
[dnl
dnl Get the cflags and libraries from the libIDL-config-2 script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/libIDL.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/libIDL.m4
@@ -3,7 +3,7 @@
dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBIDL,
+AC_DEFUN([AM_PATH_LIBIDL],
[dnl
dnl Get the cflags and libraries from the libIDL-config script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/libart.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/libart.m4
@@ -8,7 +8,7 @@
dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBART,
+AC_DEFUN([AM_PATH_LIBART],
[dnl
dnl Get the cflags and libraries from the libart-config script
dnl
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/nspr.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/nspr.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
-AC_DEFUN(AM_PATH_NSPR,
+AC_DEFUN([AM_PATH_NSPR],
[dnl
AC_ARG_WITH(nspr-prefix,
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/build/autoconf/pkg.m4
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/build/autoconf/pkg.m4
@@ -2,7 +2,7 @@
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
+AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/browser/app/profile/firefox.js
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/browser/app/profile/firefox.js
@@ -49,6 +49,7 @@
#endif
pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
+pref("startup.homepage_override.mstone","ignore");
pref("general.startup.browser", true);
pref("browser.chromeURL","chrome://browser/content/");
@@ -72,12 +73,12 @@
// App-specific update preferences
// Whether or not app updates are enabled
-pref("app.update.enabled", true);
+pref("app.update.enabled", false);
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
// the UI easier to construct.
-pref("app.update.auto", true);
+pref("app.update.auto", false);
// Defines how the Application Update Service notifies the user about updates:
//
@@ -156,7 +157,6 @@
pref("keyword.enabled", true);
pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
-pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");
@@ -169,12 +169,13 @@
// Whether or not the application should check at startup each time if it
// is the default browser.
-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
// XXXBlake Remove this stupid pref
pref("browser.startup.page", 1);
-pref("browser.startup.homepage", "resource:/browserconfig.properties");
+pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties");
+pref("browser.startup.homepage_override.mstone","ignore");
pref("browser.cache.disk.capacity", 50000);
pref("browser.enable_automatic_image_resizing", true);
@@ -314,6 +315,9 @@
pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
// 0=lines, 1=pages, 2=history , 3=text size
#ifdef XP_MACOSX
// On OS X, if the wheel has one axis only, shift+wheel comes through as a
@@ -332,6 +336,8 @@
pref("mousewheel.withaltkey.action",0);
pref("mousewheel.withaltkey.sysnumlines",false);
+pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page
+
pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code
// Customizable toolbar stuff
@@ -380,6 +386,10 @@
pref("security.warn_viewing_mixed.show_once", true);
pref("security.warn_submit_insecure.show_once", true);
+// enable negotiate extension
+pref("network.negotiate-auth.trusted-uris", "https://");
+
+
#ifdef XP_UNIX
pref("browser.urlbar.clickSelectsAll", false);
#else
@@ -416,4 +426,6 @@
// Setting this pref to |true| forces BiDi UI menu items and keyboard shortcuts
// to be exposed. By default, only expose it for bidi-associated system locales.
-pref("bidi.browser.ui", false);
+pref("bidi.browser.ui", true);
+
+pref("mozilla.widget.raise-on-setfocus", false);
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
@@ -39,6 +39,15 @@
Mozilla Contributors
classic/1.0
+
+
+
+ skin/classic/browser/
+ skin/classic/global/
+ skin/classic/communicator/
+ skin/classic/mozapps/
+
+
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/browser/base/content/aboutDialog.xul
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/browser/base/content/aboutDialog.xul
@@ -79,7 +79,7 @@
©rightText;
-
+
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/browser/base/content/baseMenuOverlay.xul
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/browser/base/content/baseMenuOverlay.xul
@@ -88,6 +88,13 @@
label="&helpReleaseNotes.label;"
oncommand="openReleaseNotes(event)"
onclick="checkForMiddleClick(this, event);"/>
+
+
+
+
+
#endif
+#if 0
+# The import wizard will usually show an empty nonfunctional dialogue.
+# So we disable it to improve discoverability of
+# Bookmarks / Manage Bookmarks ... // File / Import ...
+# https://bugzilla.mozilla.org/show_bug.cgi?id=117844
+# bugs.debian.org/350599
+#endif
#ifndef XP_MACOSX
#endif
--- firefox-1.5.dfsg+1.5.0.15~prepatch080417a.orig/browser/base/content/search.xml
+++ firefox-1.5.dfsg+1.5.0.15~prepatch080417a/browser/base/content/search.xml
@@ -141,15 +141,18 @@
this._initializeEngine();
var element;
- element = document.createElementNS(XUL_NS, "menuseparator");
- this.mContextMenu.appendChild(element);
- element = document.createElementNS(XUL_NS, "menuitem");
- element.setAttribute("label", this.mStringBundle
- .getString("cmd_clearHistory"));
- element.setAttribute("accesskey", this.mStringBundle
- .getString("cmd_clearHistory_accesskey"));
- element.setAttribute("cmd", "cmd_clearhistory");
- this.mContextMenu.appendChild(element);
+# clearHistory doesn't work properly because it misses clearing the
+# corresponding URL history items. So we disable it for now to avoid
+# unfortunate accidents.
+# element = document.createElementNS(XUL_NS, "menuseparator");
+# this.mContextMenu.appendChild(element);
+# element = document.createElementNS(XUL_NS, "menuitem");
+# element.setAttribute("label", this.mStringBundle
+# .getString("cmd_clearHistory"));
+# element.setAttribute("accesskey", this.mStringBundle
+# .getString("cmd_clearHistory_accesskey"));
+# element.setAttribute("cmd", "cmd_clearhistory");
+# this.mContextMenu.appendChild(element);
this.controllers.appendController(this.searchbarController);
]]>