--- firefox-2.0.0.14+1nobinonly.orig/browser/app/Makefile.in +++ firefox-2.0.0.14+1nobinonly/browser/app/Makefile.in @@ -88,7 +88,9 @@ $(EXTRA_DSO_LIBS) \ $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \ $(MOZ_JS_LIBS) \ + -Wl,--no-as-needed \ $(XPCOM_LIBS) \ + -Wl,--as-needed \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) --- firefox-2.0.0.14+1nobinonly.orig/browser/app/firefox-branding.js +++ firefox-2.0.0.14+1nobinonly/browser/app/firefox-branding.js @@ -1,14 +1,14 @@ -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("startup.homepage_override_url","http://www.ubuntu.com/download/releasenotes/610"); +pref("startup.homepage_welcome_url","http://www.ubuntu.com/download/releasenotes/610"); // URL user can browse to manually if for some reason all update installation // attempts fail. pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); +pref("app.update.url.details", "file:///usr/share/ubuntu-artwork/home/index.html"); // Release notes URL -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +pref("app.releaseNotesURL", "http://www.ubuntu.com/download/releasenotes/610"); // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); --- firefox-2.0.0.14+1nobinonly.orig/browser/app/profile/firefox.js +++ firefox-2.0.0.14+1nobinonly/browser/app/profile/firefox.js @@ -80,12 +80,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: // @@ -173,12 +173,12 @@ // 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 visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore pref("browser.startup.page", 1); -pref("browser.startup.homepage", "resource:/browserconfig.properties"); +pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); pref("browser.cache.disk.capacity", 50000); pref("browser.enable_automatic_image_resizing", true); @@ -247,7 +247,7 @@ pref("browser.link.open_external", 3); // handle links targeting new windows -pref("browser.link.open_newwindow", 3); +pref("browser.link.open_newwindow", 2); // 0: no restrictions - divert everything // 1: don't divert window.open at all @@ -338,6 +338,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 @@ -367,6 +370,8 @@ pref("mousewheel.withcontrolkey.sysnumlines",false); pref("mousewheel.withcontrolkey.numlines",1); +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 @@ -414,6 +419,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 @@ -446,8 +455,8 @@ pref("browser.download.hide_plugins_without_extensions", true); // 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); +// to be exposed. +pref("bidi.browser.ui", true); // Backspace and Shift+Backspace behavior // 0 goes Back/Forward @@ -542,3 +551,7 @@ pref("browser.sessionstore.privacy_level", 1); // number of remembered reopenable tabs (per window) pref("browser.sessionstore.max_tabs_undo", 10); + +pref("mozilla.widget.raise-on-setfocus", false); + +pref("browser.startup.homepage_override.mstone","ignore"); --- firefox-2.0.0.14+1nobinonly.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +++ firefox-2.0.0.14+1nobinonly/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in @@ -55,3 +55,5 @@ install:: $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + +GARBAGE += $(FILES) --- firefox-2.0.0.14+1nobinonly.orig/browser/base/jar.mn +++ firefox-2.0.0.14+1nobinonly/browser/base/jar.mn @@ -37,6 +37,7 @@ * content/browser/web-panels.js (content/web-panels.js) * content/browser/web-panels.xul (content/web-panels.xul) * content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul) +* content/browser/ubuntuReportBugOverlay.js (content/ubuntuReportBugOverlay.js) # XXX: We should exclude this one as well (bug 71895) * content/browser/hiddenWindow.xul (content/hiddenWindow.xul) #ifdef XP_MACOSX --- firefox-2.0.0.14+1nobinonly.orig/browser/base/content/baseMenuOverlay.xul +++ firefox-2.0.0.14+1nobinonly/browser/base/content/baseMenuOverlay.xul @@ -51,6 +51,8 @@