From 985b56ea3567f1de3007a5ffc8f82dd51b356507 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Fri, 25 May 2007 22:09:30 +0000 Subject: [PATCH] Bug 381099 - Turn on breakpad by default for win+mac builds, r=luser git-svn-id: svn://10.0.0.236/trunk@227036 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/Makefile.in | 4 ++ mozilla/browser/app/nsBrowserApp.cpp | 6 ++- .../browser/branding/unofficial/branding.nsi | 2 +- mozilla/browser/installer/removed-files.in | 38 +++++++++++++++++++ .../installer/windows/nsis/branding.nsi | 2 +- 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in index cbfcbbe39be..43402e2b167 100644 --- a/mozilla/browser/app/Makefile.in +++ b/mozilla/browser/app/Makefile.in @@ -218,6 +218,10 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" +ifdef MOZILLA_OFFICIAL +DEFINES += -DMOZILLA_OFFICIAL +endif + ifdef BUILD_STATIC_LIBS include $(topsrcdir)/config/static-rules.mk diff --git a/mozilla/browser/app/nsBrowserApp.cpp b/mozilla/browser/app/nsBrowserApp.cpp index 3720e6d9087..8d22d9d78c5 100644 --- a/mozilla/browser/app/nsBrowserApp.cpp +++ b/mozilla/browser/app/nsBrowserApp.cpp @@ -53,7 +53,11 @@ static const nsXREAppData kAppData = { "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", "Copyright (c) 1998 - 2007 mozilla.org", NS_XRE_ENABLE_PROFILE_MIGRATOR | - NS_XRE_ENABLE_EXTENSION_MANAGER, + NS_XRE_ENABLE_EXTENSION_MANAGER +#if defined(MOZILLA_OFFICIAL) && (defined(XP_WIN) || defined(XP_MACOSX)) + | NS_XRE_ENABLE_CRASH_REPORTER +#endif +, nsnull, // xreDirectory nsnull, // minVersion nsnull, // maxVersion diff --git a/mozilla/browser/branding/unofficial/branding.nsi b/mozilla/browser/branding/unofficial/branding.nsi index 36b863b1715..546a03639f8 100644 --- a/mozilla/browser/branding/unofficial/branding.nsi +++ b/mozilla/browser/branding/unofficial/branding.nsi @@ -47,4 +47,4 @@ !define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html" # Percentage of new "Standard" installs to enable talkback for -!define RandomPercent "100" +!define RandomPercent "50" diff --git a/mozilla/browser/installer/removed-files.in b/mozilla/browser/installer/removed-files.in index f661ee3b68e..7e25d899f99 100644 --- a/mozilla/browser/installer/removed-files.in +++ b/mozilla/browser/installer/removed-files.in @@ -448,3 +448,41 @@ searchplugins/zoznam-sk.png searchplugins/zoznam-sk.gif components/sidebar.xpt components/xmlextras.xpt +#ifdef XP_MACOSX +extensions/talkback@mozilla.org/install.rdf +extensions/talkback@mozilla.org/chrome.manifest +extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@ +extensions/talkback@mozilla.org/components/qfaservices.xpt +extensions/talkback@mozilla.org/components/talkback/master.ini +extensions/talkback@mozilla.org/components/talkback/talkback@DLL_SUFFIX@ +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Info.plist +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/MacOS/Talkback +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/pbdevelopment.plist +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/PkgInfo +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/delete.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/disable.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/enable.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/classes.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/info.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ArchivingSettings.nib/objects.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/InfoPlist.strings +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/classes.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/info.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/IntroWizard.nib/objects.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/Localizable.strings +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/classes.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/info.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/ProxySettings.nib/objects.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/classes.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/info.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/objects.nib +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoKeys.plist +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoSections.plist +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/send.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff +extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns +#endif diff --git a/mozilla/browser/installer/windows/nsis/branding.nsi b/mozilla/browser/installer/windows/nsis/branding.nsi index 113b06ce3bd..6a6bb78367b 100644 --- a/mozilla/browser/installer/windows/nsis/branding.nsi +++ b/mozilla/browser/installer/windows/nsis/branding.nsi @@ -47,4 +47,4 @@ !define SurveyURL "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html" # Percentage of new "Standard" installs to enable talkback for -!define RandomPercent "100" +!define RandomPercent "50"